Merging Changes From CarlKenner:VR-Hydra Branch to cegli:VR-Hydra Branch