Merge branch 'ph/send-email'