Merging pretty good branch v1.80-dbperf to v1.80