Keeping in sync with the Trident repo.