merge with ros-industrial