Merge branch 'rs/commit-m-no-edit' into maint