category helper
Merge remote-tracking branch 'origin/Sprint4' into Klim