TRUNK-1906 updated validation