Backport 23304 to v1.14

Description

None

Environment

None

Assignee

Flavio Ceolin

Reporter

David Brown

Labels

None

Authorized viewers

None

CVE

None

Embargo Lift

None

Fix versions

Affects versions

Priority

Medium
Configure