Getting GCMImprovements branch up to date