Add performance tests
Merge remote-tracking branch 'origin/Vlad' into Vlad