Hi,

When you say some of your custom templates, does that mean that some did not have it turned on? (i.e. it doesn't affect all your templates)? Do you have a copy of a template from before the 21.1 update so we can take a look?

The issue with saving has been logged and is being investigated by the developers.

Thanks