Merge branch 'hns3-Some-cleanup-and-bugfix-for-desc-filling'