@neild requested issue #54385 to be considered for backport to the next 1.18 minor release. @gopherbot please open backport issues.