CONN-536: Fixed Direct event datasource issue