[ros-diffs] [gvg] 15690: Work around problem in wrc