[TIDOC-1210](3_1_X) Updates for new module version and GCM support