Merge updates from cob_robots