Merge branch 'rr/fmt-merge-msg'