Cherry-pick 29c905a152b5cbc8ab67b2cc758ef3f7c8f58d88 from upstream#1829
Merged
openshift-merge-bot[bot] merged 1 commit intoJun 24, 2026
Merged
29c905a152b5cbc8ab67b2cc758ef3f7c8f58d88 from upstream#1829