Fixes #19647 Adds integration test to catch multiple handler notifications (cherry picked from commit c2495677b0)
c2495677b0
Fixes #6678 Fixes #6670