Merge "Cleaning up joint_motion_search function."