Additions GCm
Merged conflicts
GCM