Merge branch 'jc/mailinfo-cleanup-fix' into maint