merged catkin version