Merge pull request #8917 from w3c/sync_6701e008e72c2e7c83123cea5eebcbb17e83893b

Merge pull request #8917 from sync_6701e008e72c2e7c83123cea5eebcbb17e83893b