Merge branch 'jc/mailinfo-RE' into maint