REL-2139: GMOS template updates

Tracking release branch update.