Syincing changes that were made locally on o5r1