25425 Changes to templates (client)