[bv-dev] BVAL-192 and BVAL-223