Merge branch 'jk/guard-bswap-header'