Feature-15377-15376/Updated SMTP config