diff --git a/.gitignore b/.gitignore
index 6e86af71481..312ac242b53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,3 +165,6 @@ samples/client/petstore/typescript-aurelia/**/dist/
 # aspnetcore
 samples/server/petstore/aspnetcore/.vs/
 effective.pom
+
+# kotlin
+samples/client/petstore/kotlin/src/main/kotlin/test/
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift4Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift4Codegen.java
index 7b48a90abef..83c8f6b34ff 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift4Codegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift4Codegen.java
@@ -125,7 +125,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
                     "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol",
                     "switch", "FUNCTION", "none", "public", "where", "LINE", "nonmutating", "static", "while", "optional",
                     "struct", "override", "subscript", "postfix", "typealias", "precedence", "var", "prefix", "Protocol",
-                    "required", "right", "set", "Type", "unowned", "weak", "Codable", "Encodable", "Decodable")
+                    "required", "right", "set", "Type", "unowned", "weak", "Data", "Codable", "Encodable", "Decodable")
         );
 
         typeMapping = new HashMap<>();
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
index 9082ede37af..55565fb0fb3 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
@@ -112,7 +112,7 @@ public class SwiftCodegen extends DefaultCodegen implements CodegenConfig {
                     "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol",
                     "switch", "FUNCTION", "none", "public", "where", "LINE", "nonmutating", "static", "while", "optional",
                     "struct", "override", "subscript", "postfix", "typealias", "precedence", "var", "prefix", "Protocol",
-                    "required", "right", "set", "Type", "unowned", "weak")
+                    "required", "right", "set", "Type", "unowned", "weak", "Data")
                 );
 
         typeMapping = new HashMap<String, String>();