Merge "Remove StereoMode" into devel/master