[ros-diffs] [cfinck] 39247: Merge 39244, 39246