Merge swift-api branch to master