[DF-590] Merge
Merge branch 'mail' into development