[ros-diffs] [jgardou] 49307: Sync with trunk (r49303)