Merge pull request #90399 from hamishknight/sync