Added extra check of changed mail address
Merge branch 'release' into development