OZP-672 - making build faster