[ros-diffs] [jgardou] 46494: sync with trunk r46493