[ros-diffs] [aandrejevic] 59679: Sync with trunk.