Merge "bufferpool2.0: Implement buffer invalidation"