TRUNK-1906 updated validation
Merge branches 'master' and 'TRUNK-1906'