Backport 23328 to v1.14.

Description

None

Environment

None

Assignee

Ruud Derwig

Reporter

David Brown

Labels

None

Authorized viewers

None

CVE

None

Embargo Lift

None

Fix versions

Priority

Medium
Configure