Merge branch 'kd/mailinfo-quoted-string' into maint