[ros-diffs] [navaraf] 17023: Merge 16932 from trunk: