Merge patch from https://review.openstack.org/#/c/21942/