Cherry-pick 8302e3f1a8596f766db8eb09ae66d4e21d065bce from upstream#1833
Merged
openshift-merge-bot[bot] merged 1 commit intoJun 25, 2026
Merged
8302e3f1a8596f766db8eb09ae66d4e21d065bce from upstream#1833