Merging industrial_core changes to motoman