Merge branch 'rb/merge-prepare-commit-msg-hook' into pu