Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Add a performance test
Merge branch 'master' into dev