DDBEASY-28 - Template corrections.