merge https://review.openstack.org/#/c/24969/