Tagging compatibility changes for D9, to be available at least from this fork while they make it to the main repo.
