Merge branch 'hotfix/14.0.4' into develop
Changes to support Kata catalog
Small typo fix
Merge branch 'feature/kata' into develop