Need to backport properly the https://review.openstack.org/#/q/68318cf10bb7e9025fec06369a47ba54d741697a,n,z
Need to backport properly the https:/ /review. openstack. org/#/q/ 68318cf10bb7e90 25fec06369a47ba 54d741697a, n,z