[ros-diffs] [navaraf] 14286: Merge from HEAD: r14232