[ros-diffs] [jgardou] 47369: Sync with trunk r47367