Re #9157. Added checks for categories.
Merge branch 'feature/9157_naming_conventions' into develop