[ros-diffs] [navaraf] 17017: Merge 16746 from trunk: