Merge "Fix issue where NodeConnector ADDED events were propagated as NodeConnector...