Looks like we need https://review.openstack.org/#/c/86037/ and https://review.openstack.org/#/c/85867/ backported to the stable branches.
Looks like we need https:/ /review. openstack. org/#/c/ 86037/ and https:/ /review. openstack. org/#/c/ 85867/ backported to the stable branches.