Merge branch 'bufferviewoverlay'