Merge branch 'const-buffer-changes'