Document new bitstream
Merge with upstream