Signed-off-by: Matan Breizman <mbreizma@redhat.com> (cherry picked from commit 682b806efa)
682b806efa