@networkimprov requested issue #39817 to be considered for backport to the next 1.13 minor release. CL at https://golang.org/cl/240343