v2.1 adjustment and refactor
Merge from integration-v2.1
Merge pull request #533 from owdqa/feature/email2.1_fixing

Feature/email2.1 fixing