[Lib-virtual-ref] Weekend VR changes