Issue #2210829 patch for fixing erroneous notification messages being sent to users.