Swift updates;
Merge commit '3357624f4e4f5c0a96906282810aabaf8bcbf5ef' into dev