Merge branch 'PHOT-54-Mailservice'