Merge Emilen's 3rd patchset

From: https://review.openstack.org/#/c/82353/