[ros-diffs] [jgardou] 46920: Sync to trunk (r46918)