Merge "Improve NewDatabasePerformanceTests" into oc-mr1-dev