Merge "[TF] Workaround for  PRODX-7986" into mcp/caracal