merging cloud controller from master