Modified emails
Merge branch 'release/upgrade'
Modified email
Merge branch 'release/Emailupdates'