[ros-diffs] [hpoussin] 23767: Fix bug 1770. Patch by Grzegorz Jaskiewicz