[ros-diffs] [tkreuzer] 56544: Sync with trunk r56543