This was a manual merge (via cherry-picks) of 3596372d003aead311700f86c282f3ebaafa36eb from the Fedora rawhide branch. Resolves: RHEL-70329 Resolves: RHEL-68697