Re: [ros-dev] [ros-diffs] [jgardou] 47802: Merge 47800 from yarotows branch.