Merge branch 'bw/commit-scrollbuffer'