[ros-diffs] [jgardou] 47228: sync with trunk r47227