Keep in sync with changes to Trident repo.