Merge branch 'hns3-promisc-updates'