fixes #3266 - ensures there are no duplicate notifications
(cherry picked from commit 93498295d89f5a66008c7989112ace8ffe7fdb11)
fixes #3266 - ensures there are no duplicate notifications
(cherry picked from commit 93498295d89f5a66008c7989112ace8ffe7fdb11)