Merge branch 'eb/mail' into next