Hotfix for CMS
Merge branch 'hotfix/0.1.11'