Remove CMS dependency - only framework is needed
Merge branch 'hotfix/1.0.2'