CONN-536: Fixed Direct event datasource issue
Merge pull request #534 from nareshcgi/CONN-536

CONN-536: Fixed Direct event datasource issue