Return SMTP factory so the client can stop it.
Merge remote-tracking branch 'kali/feature/return-smtp-factory' into develop