Merge branch 'cb/byte-order' into maint