Merge https://review.openstack.org/#/c/111892/