Merge branch 'nick-prefix-buffer'