Cleanup for rebase with develop branch, remove benchmark in dispatch_request, etc