Merge branch 'hotfix/v8' into production
Small ckeditor changes
Merge branch 'hotfix/h9'