[ros-diffs] [tkreuzer] 56554: Sync with trunk r56553