[ros-diffs] [gvg] 13244: Fix compilation