[ros-diffs] [cfinck] 41588: Branch for 0.3.10 from r41446