[ros-diffs] [chorns] 17412: Change o to optional