Merge branch 't/bitstream_improvements'