Update hawaii-swordfish-git