Heuristics on for .cl
Merge pull request #1522 from github/cl-heuristics

Heuristics on for .cl
Merge pull request #1552 from github/benchmarking

Benchmarking