[ros-diffs] [tkreuzer] 66768: Sync with trunk r66766