Merge branch 'hns-fixes'