Merge branch 'jk/maint-commit-amend-only-no-paths'