GCP-8616 GDMS Schema Changes v2.1