[ros-diffs] [gvg] 17771: Fix maximizing problem introduced by r17764