Improved category cache
Merge branch 'feature-r4' into develop
Finally feature-r4, a global product and services view
Merge branch 'feature-r4' into develop