Catch up branch: editor-next