Merge branch 'swift-fixes' into dt-test