Merge branch 'release/v.2.9.7'
ALM-400 add domain to sending email
Merge remote-tracking branch 'origin/master' into develop