Merge branch 'js/send-email'