Merge branch '2953_editor_fpe'