swift

5eb32261 - Merge pull request #71169 from slavapestov/one-more-round-of-fixes