Merge pull request #16800 from pradpnayak/notifyEmail