Merge branch 'hw-offload'