I believe this has been fixed in OSP-9 with the upstream backport to Mikata here -https://review.openstack.org/#/c/399808/.