Merge branch 'master' into oldstate
Better performance with buffering