comments editor fixed.
Merge branch '#29533_comments_editor_fix' into cmaster