Merge branch 'rt/commentchar-fmt-merge-msg'