improve Validate & test
rename containerTemplates
Merge branch 'master' into v4