Partial commit for CO-784 Email Notifications