Merge branch 'dt/mailinfo' into maint