FORGE-1745: Updated for Breaking changes in Templates API with 2.5.0