Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com> (cherry picked from commit 8a4fb78988)
8a4fb78988