Added missing benchmarks.
Merge branch 'master' into benchmark