Merge "Fix reference loop in IEventQueue implementation." into oc-dev