Merge branch 'hotfix/1.22.1'
patch for missing category
fix validation for exemption code
Merge branch 'hotfix/v1.22.1' into develop