[ros-diffs] [gvg] 18411: Workaround for bug 899