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