Merge branch 'rs/bswap-ubsan-fix' into maint