full upgrade to 2.1, including perf tests and docs