Changes for GDG[x] Cloud