CMS-6 fixed
jira CMS bugs solved (8-13)