Swift: backport to release

Follow up of #1832 

@Wikia/platform-team / @moliwikia