Merge pull request #31442 from Neilhamza/fix/ensure-nodes-ready-degraded-tnf