Perf improvements
Commit 76585 pushed by Anže Pečar

12 tests 12 passed Duration