merge branch 'speed-improvements'