#23898 - Fixed issue with template validation with using new fields
setting in configuration