Merge branch 'jk/maint-merge-msg-fix' into maint