[ros-diffs] [hpoussin] 26786: One more fix for release build