Merge branch 'hns3-fixes'