Merge branch 'net-hns3-fixes-fot-net'