Merge branch 'htb-offload'