swift

9569eafe - Merge pull request #76660 from kavon/small-fixes