termite: Add changes from v9