Issue #26741: Merge ResourceWarning fixes from 3.5