Rebase to upstream commit (be5e3b8db2) Resolves: RHEL-78709 Resolves: RHEL-77272 Resolves: RHEL-80478 Resolves: RHEL-81043 Resolves: RHEL-81050 Signed-off-by: Tao Liu <ltao@redhat.com>
