Merge branch 'cb/byte-order'