Merge branch 'jc/mailinfo-RE'