propagating fixes from moveit_core