[ros-diffs] [arty] 35661: Merge up. Commit WIP.