Merge branch 'hns3-next'