Rebase to upstream commit (8e8945e509) Resolves: RHEL-114948 Signed-off-by: Tao Liu <ltao@redhat.com>