Merge "Fix to comp_inter_joint_search_thresh feature."