[ros-diffs] [jgardou] 48246: Sync with trunk (48237)