[ros-diffs] [arty] 39803: Pull from git, part 5.