Merge branch 'master' into defeq_perf2