Merge "[TF] Fix verification of operating status" into mcp/ussuri