Merge branch 'hns3-cleanups'