Merge branch 'jberlin-editor' into editor (resolve pull request)