Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint