Merge branch 'speed' into next