BVAL-168: more notempty align with spec
7 files changed