[ros-diffs] [gadamopoulos] 60597: fix build