Tweak buffer usage/flags.
Merge branch 'master' into experimental