Merge branch 'jh/resize-convert-scratch-buffer'