Merge pull request #170 from itaiferber/pr-foundation-3.0-integration

[DO NOT MERGE YET] Cherry-pick commits required for swift-3.0-branch Foundation integration