[ros-diffs] [hpoussin] 16937: Add back changes of revision 16783. Sorry Alex