Merging Changes From CarlKenner:VR-Hyrda Branch