[ros-diffs] [jgardou] 49323: sync with trunk r49322