Waiting for an official nightly build to check if any code conflicts exist
This bug has been verified on payload 4.10.0-0.nightly-2022-07-25-110002 The changes have been backport to 4.10 successfully without any conflict
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory (Moderate: OpenShift Container Platform 4.10.25 bug fix and security update), and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHSA-2022:5730