[ros-diffs] [tkreuzer] 55944: Sync with trunk r55943