Merge Emilien's patch set 2

Pulled from here - https://review.openstack.org/#/c/82353/