Merge branch 'feature/category-refactor' into develop