Caching categories
Apply review comments
fix typo
Merge remote-tracking branch 'upstream/dev' into dev
Add missing clean
Fix CSM tests
Fix typo
Add Csm tests to overall tests
Merge pull request #1288 from andrerod/dev

caching categories