Merge "bufferpool@2.0: Ensure uniqueness of connection id" into main