re #878 - Added email
Merge branch 'feature/878-bin' into staging