Merge branch 'ls/maint-mailinfo-patch-label' into maint