Resolves: RHBZ#1966123 Signed-off-by: Gris Ge <fge@redhat.com>
Resolves: RHBZ#1915254 Signed-off-by: Wen Liang <wenliang@redhat.com>