Merge branch 'eb/mail'