@rbqvq requested issue#76283 to be considered for backport to the next 1.25 minor release.

@gopherbot please consider this for backport to 1.25 and 1.24.

Its a bug and minimal fixes that can backport easily