Merge pull request #11220 from mukeshcompucorp/HW-382-individual-case-type-setting...