Adding necessary adjustments to get Swift integrated into Cloud
Merge branch 'v2.0' into v2.0-swift-studio-integration
Merge branch 'v2.0-swift-studio-integration' into v2.0-swift-feature-branch