Merge branch 'cw/amend-commit-without-message'