CLOUD-216 fixed template