first commit of catkin conversion