1.0dev.14: support for generating multiple alignment candidates, switches to turn off optimizations for perf tests
Fix merge conflicts