Merge gsoc-cloud-storage

The first merge for the gsoc-cloud-storage branch.