swift

76b893db - Merge pull request #61519 from hamishknight/minor-cleanup