Merge Rover-83,84 changes