Applied fixes from editor_v1 (ckeditor v3)