Cherry-pick b20329271317acd0cbfe597225c9ab63bf9cf7b5 from upstream#1848
Merged
openshift-merge-bot[bot] merged 1 commit intoJul 8, 2026
Merged
b20329271317acd0cbfe597225c9ab63bf9cf7b5 from upstream#1848