Latest cloud_controller changes