[ros-diffs] [jgardou] 64223: Update to trunk r64222