Reintegrate SMTP module
Merge remote-tracking branch 'chiiph/feature/re-integrate-smtp' into develop