[ros-diffs] [hpoussin] 32196: Fix for the fix