Backport to release
Merge pull request #1835 from Wikia/release-193-swift-changes

Swift: backport to release