Merge branch 'qed-tunneling-offload'