Merge commit 'paulus-perf/master' into next