Merge branch 'dd/mailinfo-with-nul'