Merge pull request #8008 from w3c/sync_3922fb3e43b75d2ff118a5ebf793180f570fdb53

Merge pull request #8008 from sync_3922fb3e43b75d2ff118a5ebf793180f570fdb53