Manual backport from v3.0.x branch. Resolves: RHEL-46572 Signed-off-by: Antonio Torres <antorres@redhat.com>