Merge branch 'hen_email' into staging