[TASK] change implementation of category mapping
Merge branch 'development' into stage