TRUNK-3142: Made isValid to be more permissive