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

1.0.2