merging test from VR

see commits below, attempting merge of VR main changes