Fork from FoundationExtension