Merge "[CMPV2] Add readiness check"