* Fix issue with multiple code branches * Add solution by @calebmer * Add performance test * Undo unrelated change