Fixed issues related to categories
Merge branch 'fix-categories' into develop
Merge branch 'develop'