[ros-diffs] [navaraf] 17018: Merge 16747 from trunk: