Merge branch 'jc/merge-msg' into next