Merge "BufferPool: limit number of idle buffers in caches" into mainline-prod