Merge "Use new socket schema within TestSlicedCondition" into rvc-dev