Merge pull request #12647 from compucorp/fix-case-type-issues