Merge "BUG-4117: notification supplier - rename"