Merge branch 'sh/email'