Closes #22617 Signed-off-by: Stefan Guilhen <sguilhen@redhat.com>
Closes #24107 Signed-off-by: Martin Kanis <mkanis@redhat.com>