[ros-diffs] [navaraf] 17021: Merge 16860 from trunk: