Merge pull request #7725 from w3c/sync_64b314ba31e1f22702f088d735dddebb92f73326

Merge pull request #7725 from sync_64b314ba31e1f22702f088d735dddebb92f73326