tgupdate: merge top-bases/girocco into girocco