Validation templates update
Merge pull request #4555 from juztas/update_templates

Validation templates update