Re-use bulk handle in perf test

Clean up perf test
Merge remote-tracking branch 'upstream/next' into next