Merge branch 'ks/prepare-commit-msg-sample-fix'