Merge branch '3774_editor_buttons'