@rolandshoemaker requested issue #74831 to be considered for backport to the next 1.24 minor release.

@gopherbot please open backport issues.