Partially fixed for 6.1/6.0.1 in https://review.openstack.org/#/c/144064/
Missing part is https://review.openstack.org/#/c/163733/
Partially fixed for 6.1/6.0.1 in https:/ /review. openstack. org/#/c/ 144064/
Missing part is https:/ /review. openstack. org/#/c/ 163733/