Performance test changes.
Created separate performance test class.
Merge branch 'master' into batchingSupport