[ros-diffs] [jgardou] 47133: Sync with trunk r47129