*8787* Resolve race condition on CV build