Merge "Depend on corresponding server in WaitCondition" into mcp/queens