diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index de5083b6b22..7092f66a60c 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -17,14 +17,14 @@ namespace {{packageName}}.Api {
     /// {{summary}} {{notes}}
     /// </summary>
     {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
     {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
 
     /// <summary>
     /// {{summary}} {{notes}}
     /// </summary>
     {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
     {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
     {{/operation}}
   }
@@ -37,7 +37,7 @@ namespace {{packageName}}.Api {
     /// <summary>
     /// Initializes a new instance of the <see cref="{{classname}}"/> class.
     /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
+    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
     /// <returns></returns>
     public {{classname}}(ApiClient apiClient = null) {
       if (apiClient == null) { // use the default one in Configuration
@@ -84,7 +84,7 @@ namespace {{packageName}}.Api {
     /// {{summary}} {{notes}}
     /// </summary>
     {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
     public {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
 
       {{#allParams}}{{#required}}
@@ -132,7 +132,7 @@ namespace {{packageName}}.Api {
     /// {{summary}} {{notes}}
     /// </summary>
     {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-    {{/allParams}}/// <returns>{{#returnType}}{{{returnType}}}{{/returnType}}</returns>
+    {{/allParams}}{{#returnType}}/// <returns>{{{returnType}}}</returns>{{/returnType}}
     public async {{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
 
       {{#allParams}}{{#required}}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
index db51ab1f753..2974cb6932b 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
@@ -15,28 +15,28 @@ namespace IO.Swagger.Api {
     /// Update an existing pet 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     void UpdatePet (Pet body);
 
     /// <summary>
     /// Update an existing pet 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     Task UpdatePetAsync (Pet body);
     
     /// <summary>
     /// Add a new pet to the store 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     void AddPet (Pet body);
 
     /// <summary>
     /// Add a new pet to the store 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     Task AddPetAsync (Pet body);
     
     /// <summary>
@@ -87,7 +87,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet that needs to be updated</param>
     /// <param name="name">Updated name of the pet</param>
     /// <param name="status">Updated status of the pet</param>
-    /// <returns></returns>
+    
     void UpdatePetWithForm (string petId, string name, string status);
 
     /// <summary>
@@ -96,7 +96,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet that needs to be updated</param>
     /// <param name="name">Updated name of the pet</param>
     /// <param name="status">Updated status of the pet</param>
-    /// <returns></returns>
+    
     Task UpdatePetWithFormAsync (string petId, string name, string status);
     
     /// <summary>
@@ -104,7 +104,7 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="apiKey"></param>
     /// <param name="petId">Pet id to delete</param>
-    /// <returns></returns>
+    
     void DeletePet (string apiKey, long? petId);
 
     /// <summary>
@@ -112,7 +112,7 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="apiKey"></param>
     /// <param name="petId">Pet id to delete</param>
-    /// <returns></returns>
+    
     Task DeletePetAsync (string apiKey, long? petId);
     
     /// <summary>
@@ -121,7 +121,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet to update</param>
     /// <param name="additionalMetadata">Additional data to pass to server</param>
     /// <param name="file">file to upload</param>
-    /// <returns></returns>
+    
     void UploadFile (long? petId, string additionalMetadata, String file);
 
     /// <summary>
@@ -130,7 +130,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet to update</param>
     /// <param name="additionalMetadata">Additional data to pass to server</param>
     /// <param name="file">file to upload</param>
-    /// <returns></returns>
+    
     Task UploadFileAsync (long? petId, string additionalMetadata, String file);
     
   }
@@ -143,7 +143,7 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Initializes a new instance of the <see cref="PetApi"/> class.
     /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
+    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
     /// <returns></returns>
     public PetApi(ApiClient apiClient = null) {
       if (apiClient == null) { // use the default one in Configuration
@@ -190,7 +190,7 @@ namespace IO.Swagger.Api {
     /// Update an existing pet 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     public void UpdatePet (Pet body) {
 
       
@@ -228,7 +228,7 @@ namespace IO.Swagger.Api {
     /// Update an existing pet 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     public async Task UpdatePetAsync (Pet body) {
 
       
@@ -265,7 +265,7 @@ namespace IO.Swagger.Api {
     /// Add a new pet to the store 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     public void AddPet (Pet body) {
 
       
@@ -303,7 +303,7 @@ namespace IO.Swagger.Api {
     /// Add a new pet to the store 
     /// </summary>
     /// <param name="body">Pet object that needs to be added to the store</param>
-    /// <returns></returns>
+    
     public async Task AddPetAsync (Pet body) {
 
       
@@ -579,7 +579,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet that needs to be updated</param>
     /// <param name="name">Updated name of the pet</param>
     /// <param name="status">Updated status of the pet</param>
-    /// <returns></returns>
+    
     public void UpdatePetWithForm (string petId, string name, string status) {
 
       
@@ -624,7 +624,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet that needs to be updated</param>
     /// <param name="name">Updated name of the pet</param>
     /// <param name="status">Updated status of the pet</param>
-    /// <returns></returns>
+    
     public async Task UpdatePetWithFormAsync (string petId, string name, string status) {
 
       
@@ -667,7 +667,7 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="apiKey"></param>
     /// <param name="petId">Pet id to delete</param>
-    /// <returns></returns>
+    
     public void DeletePet (string apiKey, long? petId) {
 
       
@@ -710,7 +710,7 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="apiKey"></param>
     /// <param name="petId">Pet id to delete</param>
-    /// <returns></returns>
+    
     public async Task DeletePetAsync (string apiKey, long? petId) {
 
       
@@ -753,7 +753,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet to update</param>
     /// <param name="additionalMetadata">Additional data to pass to server</param>
     /// <param name="file">file to upload</param>
-    /// <returns></returns>
+    
     public void UploadFile (long? petId, string additionalMetadata, String file) {
 
       
@@ -798,7 +798,7 @@ namespace IO.Swagger.Api {
     /// <param name="petId">ID of pet to update</param>
     /// <param name="additionalMetadata">Additional data to pass to server</param>
     /// <param name="file">file to upload</param>
-    /// <returns></returns>
+    
     public async Task UploadFileAsync (long? petId, string additionalMetadata, String file) {
 
       
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
index b7bab55ed9a..14188799013 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
@@ -55,14 +55,14 @@ namespace IO.Swagger.Api {
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
     /// <param name="orderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
+    
     void DeleteOrder (string orderId);
 
     /// <summary>
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
     /// <param name="orderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
+    
     Task DeleteOrderAsync (string orderId);
     
   }
@@ -75,7 +75,7 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Initializes a new instance of the <see cref="StoreApi"/> class.
     /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
+    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
     /// <returns></returns>
     public StoreApi(ApiClient apiClient = null) {
       if (apiClient == null) { // use the default one in Configuration
@@ -355,7 +355,7 @@ namespace IO.Swagger.Api {
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
     /// <param name="orderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
+    
     public void DeleteOrder (string orderId) {
 
       
@@ -396,7 +396,7 @@ namespace IO.Swagger.Api {
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
     /// <param name="orderId">ID of the order that needs to be deleted</param>
-    /// <returns></returns>
+    
     public async Task DeleteOrderAsync (string orderId) {
 
       
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
index 27cd4afc92e..86549479e32 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
@@ -15,42 +15,42 @@ namespace IO.Swagger.Api {
     /// Create user This can only be done by the logged in user.
     /// </summary>
     /// <param name="body">Created user object</param>
-    /// <returns></returns>
+    
     void CreateUser (User body);
 
     /// <summary>
     /// Create user This can only be done by the logged in user.
     /// </summary>
     /// <param name="body">Created user object</param>
-    /// <returns></returns>
+    
     Task CreateUserAsync (User body);
     
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     void CreateUsersWithArrayInput (List<User> body);
 
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     Task CreateUsersWithArrayInputAsync (List<User> body);
     
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     void CreateUsersWithListInput (List<User> body);
 
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     Task CreateUsersWithListInputAsync (List<User> body);
     
     /// <summary>
@@ -72,13 +72,13 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Logs out current logged in user session 
     /// </summary>
-    /// <returns></returns>
+    
     void LogoutUser ();
 
     /// <summary>
     /// Logs out current logged in user session 
     /// </summary>
-    /// <returns></returns>
+    
     Task LogoutUserAsync ();
     
     /// <summary>
@@ -100,7 +100,7 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="username">name that need to be deleted</param>
     /// <param name="body">Updated user object</param>
-    /// <returns></returns>
+    
     void UpdateUser (string username, User body);
 
     /// <summary>
@@ -108,21 +108,21 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="username">name that need to be deleted</param>
     /// <param name="body">Updated user object</param>
-    /// <returns></returns>
+    
     Task UpdateUserAsync (string username, User body);
     
     /// <summary>
     /// Delete user This can only be done by the logged in user.
     /// </summary>
     /// <param name="username">The name that needs to be deleted</param>
-    /// <returns></returns>
+    
     void DeleteUser (string username);
 
     /// <summary>
     /// Delete user This can only be done by the logged in user.
     /// </summary>
     /// <param name="username">The name that needs to be deleted</param>
-    /// <returns></returns>
+    
     Task DeleteUserAsync (string username);
     
   }
@@ -135,7 +135,7 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Initializes a new instance of the <see cref="UserApi"/> class.
     /// </summary>
-    /// <param name="apiClient"> an instance of ApiClient (optional)
+    /// <param name="apiClient"> an instance of ApiClient (optional)</param>
     /// <returns></returns>
     public UserApi(ApiClient apiClient = null) {
       if (apiClient == null) { // use the default one in Configuration
@@ -182,7 +182,7 @@ namespace IO.Swagger.Api {
     /// Create user This can only be done by the logged in user.
     /// </summary>
     /// <param name="body">Created user object</param>
-    /// <returns></returns>
+    
     public void CreateUser (User body) {
 
       
@@ -220,7 +220,7 @@ namespace IO.Swagger.Api {
     /// Create user This can only be done by the logged in user.
     /// </summary>
     /// <param name="body">Created user object</param>
-    /// <returns></returns>
+    
     public async Task CreateUserAsync (User body) {
 
       
@@ -257,7 +257,7 @@ namespace IO.Swagger.Api {
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     public void CreateUsersWithArrayInput (List<User> body) {
 
       
@@ -295,7 +295,7 @@ namespace IO.Swagger.Api {
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     public async Task CreateUsersWithArrayInputAsync (List<User> body) {
 
       
@@ -332,7 +332,7 @@ namespace IO.Swagger.Api {
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     public void CreateUsersWithListInput (List<User> body) {
 
       
@@ -370,7 +370,7 @@ namespace IO.Swagger.Api {
     /// Creates list of users with given input array 
     /// </summary>
     /// <param name="body">List of user object</param>
-    /// <returns></returns>
+    
     public async Task CreateUsersWithListInputAsync (List<User> body) {
 
       
@@ -487,7 +487,7 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Logs out current logged in user session 
     /// </summary>
-    /// <returns></returns>
+    
     public void LogoutUser () {
 
       
@@ -523,7 +523,7 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Logs out current logged in user session 
     /// </summary>
-    /// <returns></returns>
+    
     public async Task LogoutUserAsync () {
 
       
@@ -643,7 +643,7 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="username">name that need to be deleted</param>
     /// <param name="body">Updated user object</param>
-    /// <returns></returns>
+    
     public void UpdateUser (string username, User body) {
 
       
@@ -686,7 +686,7 @@ namespace IO.Swagger.Api {
     /// </summary>
     /// <param name="username">name that need to be deleted</param>
     /// <param name="body">Updated user object</param>
-    /// <returns></returns>
+    
     public async Task UpdateUserAsync (string username, User body) {
 
       
@@ -727,7 +727,7 @@ namespace IO.Swagger.Api {
     /// Delete user This can only be done by the logged in user.
     /// </summary>
     /// <param name="username">The name that needs to be deleted</param>
-    /// <returns></returns>
+    
     public void DeleteUser (string username) {
 
       
@@ -768,7 +768,7 @@ namespace IO.Swagger.Api {
     /// Delete user This can only be done by the logged in user.
     /// </summary>
     /// <param name="username">The name that needs to be deleted</param>
-    /// <returns></returns>
+    
     public async Task DeleteUserAsync (string username) {