Merge branch 'alternative-editor'