Merge "support:design fix possible flakiness in tests" into nyc-support-25.2-dev