Added core-based buffer implementation.
Merge branch 'core-local-buffer'