Merge remote-tracking branch 'refs/remotes/qcubed/feature-AddSelectorToEventBase' into dev-v3