GCM
Revert "GCM"

This reverts commit 1c2829532febffba60d79fa89be0e096b4c4d9bb.
Merge remote-tracking branch 'origin/Client' into Client