Merge "ART: Change direct-method overlap detection"