Feature-15377+15376/Updated with metrics mail for production