Merge branch 'jc/plug-fmt-merge-msg-leak' into maint