propagating changes from moveit_core