Merged from refactoring_buffer_usage