[ros-diffs] [dgorbachev] 37839: Trying to fix...