[ros-diffs] [navaraf] 17006: Merge 16557 (hbirr) from trunk: