[ros-diffs] [navaraf] 17015: Merge 16736 from trunk: