Merge exception notifier from uat