More buffer tweaks.
Merge branch 'master' into experimental