CLOUD-338 template changes