Merge branch 'sb/merge-commit-msg-hook' into next