Partial commit of ROS controller changes.