Merge branch 'ls/maint-mailinfo-no-inbody' into maint