Bug #368
See issue notes for benchmarks