Merge branch 'nd/commit-editor-cleanup'