[ros-diffs] [weiden] 24513: Fix optimization bug