DAR-1405 Avoiding count on master

**DO NOT MERGE**

To be CR'ed and tested by the team