[ros-diffs] [navaraf] 17022: Merge 16921 (weiden) from trunk: