Cloned for OSP9 and osp10 ^ https://bugzilla.redhat.com/show_bug.cgi?id=1438696 https://bugzilla.redhat.com/show_bug.cgi?id=1438698