Merge branch 'js/fmt-merge-msg'