Code

Merge branch 'sb/fmt-merge-msg'