[ros-diffs] [jgardou] 48024: Sync with trunk (r48008) Bets are open : will this break anything?