Merge branch 'hns3-RAS'