Merge pull request #7696 from w3c/sync_de14d68a7a0609e30caf9223406b7c422c92bbdc

Merge pull request #7696 from sync_de14d68a7a0609e30caf9223406b7c422c92bbdc