[ros-diffs] [navaraf] 14278: Merge from HEAD: r14166