Merge branch 'jc/merge-msg'