CLOUD-216 gcc template fix