(Tom de Vries, RHEL-7329) Resolves: RHEL-7329
Since this is a trivial backport, no z-stream clone was created and this is being sent along with the rebase bug. The customer issue can be found at RHEL-50069 Relates: RHEL-92896
Resolves: RHEL-92896
Resolves: RHEL-81744