Merge 'feature/ckeditor-upgrade' into master branch