Squashed v1.80-dbperformance into one commit