Merge branch 'jn/merge-no-edit-fix' into maint