Merge branch 'hotfix/#6429-zend-validate-copy-paste-typo-fix'

Close #6429
Fixed typo
Merge branch 'hotfix/#6440-template-path-stack-resolver-factory-typo-fix' into develop

Close #6440