Merge branch 'nf-hw-offload'