ANTI-381 - initial move ove RV code to this repo