[ros-diffs] [jgardou] 49142: Sync with trunk head (r49139)