Updates to Swift branch.