Feature/zen 15671

We should be honoring eventKey from data source