Merge pull request #9311 from w3c/sync_ed63c8c97b001265daf5e2fa8af9cdfe69c7b771

Merge pull request #9311 from sync_ed63c8c97b001265daf5e2fa8af9cdfe69c7b771