Merge branch 'pb/prepare-commit-msg'