[ros-diffs] [jgardou] 48419: Sync with trunk (r48414)