Please try my last patch https://review.opendev.org/721554 which I hope will solve this issue for You.
Please try my last patch https:/ /review. opendev. org/721554 which I hope will solve this issue for You.