BAC-920: Swift fixes for release-194