Merge branch 'eb/mailinfo'