Rebase to upstream commit (f2c8309a41) Resolves: RHEL-29891 Resolves: RHEL-31797 Resolves: RHEL-33028 Signed-off-by: Tao Liu <ltao@redhat.com>