[ros-diffs] [arty] 39801: Pull from git, part 3 of many.