[ros-diffs] [jgardou] 47117: Sync with trunk (r47116), hopefully without breaking anything.