Merge exception notifier from UAT branch