Merge branch '35-integrator-mail-adds-conditions-to-mail-security-and-authentication' into 'dev'

Resolve "[Integrator] - Mail - Adds conditions to mail security and authentication"

See merge request !45