fixes for theme cms accomondation
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  grants api