Merge "[IMPROVE] Buffer: add counting in lists"