Merge "Avoid integer overflow by bit shift operation in the *Buffer.putBuffer methods" into main