Merge "Added the initial traits for bufferstreams." into main