Merge branch 'hotfix/cs-fixes'
Ensure collection returned has routes
Merge branch 'hotfix/collection-route-injection' into develop

Fixes issue with collections not having collection route injected