Well, I decided to combine both solutions as well :) See an updated patch https://review.openstack.org/#/c/124121/
Well, I decided to combine both solutions as well :) See an updated patch https:/ /review. openstack. org/#/c/ 124121/