Fixed format/template bug introduce with validation error fixing
Release 26.20