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