Merge "Verify duplicate upstream notifications are ignored"