[ros-diffs] [jgardou] 48145: Sync with trunk (r48123)