[ros-diffs] [jgardou] 47347: sync with trunk r47346