Merge pull request #8910 from w3c/sync_96421fcf35256b7401b1de94150b951d1959b089

Merge pull request #8910 from sync_96421fcf35256b7401b1de94150b951d1959b089