diff --git a/modules/openapi-generator/src/main/resources/Eiffel/README.mustache b/modules/openapi-generator/src/main/resources/Eiffel/README.mustache
index f8ba1b5e2ebc7515a3b3d0bc4f5dd5bb533d8ef9..bc44aa484a516942a5589fe264a948e8e68d8775 100644
--- a/modules/openapi-generator/src/main/resources/Eiffel/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Eiffel/README.mustache
@@ -1,8 +1,8 @@
 # Eiffel API client for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/Groovy/README.mustache b/modules/openapi-generator/src/main/resources/Groovy/README.mustache
index 424dfb435755ad57f551016b06138358d9a89bc8..be054fb041c9f0306040f805d4f6626cb2d54661 100644
--- a/modules/openapi-generator/src/main/resources/Groovy/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Groovy/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This Groovy package, using the [http-builder-ng library](https://http-builder-ng.github.io/http-builder-ng/), is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/Java/README.mustache b/modules/openapi-generator/src/main/resources/Java/README.mustache
index f1bb9f234cdc73427bfa07121914370d55fa8e87..917f873d5dce8503061583f96223baa113695b5e 100644
--- a/modules/openapi-generator/src/main/resources/Java/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/README.mustache
@@ -8,7 +8,7 @@
 - Build date: {{generatedDate}}
 {{/hideGenerationTimestamp}}
 
-{{#appDescription}}{{{appDescription}}}{{/appDescription}}
+{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
 
 {{#infoUrl}}
   For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/README.mustache
index 576e70fe8bae1a50b25a7d16d45ed1fded28c08c..8d126ada313b5938bcab2fdd98297c3a7c54c53e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/README.mustache
@@ -1,9 +1,9 @@
 # {{appName}} - MicroProfile Rest Client
 
-{{#appDescription}}
-{{{appDescription}}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
 
-{{/appDescription}}
+{{/appDescriptionWithNewLines}}
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
 [MicroProfile Rest Client](https://github.com/eclipse/microprofile-rest-client) is a type-safe way of calling
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
index 44356cca82c9d1473e918371270cdc0fd4cb2848..f574b47b485376e6c7f17379df46367d400d0d9a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
@@ -8,7 +8,7 @@
 - Build date: {{generatedDate}}
 {{/hideGenerationTimestamp}}
 
-{{#appDescription}}{{{appDescription}}}{{/appDescription}}
+{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
 
 {{#infoUrl}}
   For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache
index e459ad31713e204fefe2423956e88412e1c6bee2..e9be868f52ccc29adbc215b94588dd817041058d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache
@@ -6,7 +6,7 @@
   - Build date: {{generatedDate}}
 {{/hideGenerationTimestamp}}
 
-{{#appDescription}}{{{appDescription}}}{{/appDescription}}
+{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
 
 {{#infoUrl}}
   For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
diff --git a/modules/openapi-generator/src/main/resources/Javascript/README.mustache b/modules/openapi-generator/src/main/resources/Javascript/README.mustache
index 2e3ea8723ab5f5580da08c0188463f7b2235a27d..fccb79dce5b64992948b0a8d48066e905536b935 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/README.mustache
@@ -1,9 +1,9 @@
 # {{projectName}}
 
 {{moduleName}} - JavaScript client for {{projectName}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: {{appVersion}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/README.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/README.mustache
index 944e6029d52bcde64c102687d38c9336342ca9f4..dd4a6721a2d7b0f1dc789e5fd39c3c3d5ac63916 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/es6/README.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/es6/README.mustache
@@ -1,9 +1,9 @@
 # {{projectName}}
 
 {{moduleName}} - JavaScript client for {{projectName}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 This SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: {{appVersion}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/README.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/README.mustache
index 71c4cfebb8b3bf53eab8fe081349066f7dca34a2..37794bd48e04c0b038afacc3a326c1bd8ad9ec47 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/README.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}} - ASP.NET Core 2.0 Server
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Run
 
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/README.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/README.mustache
index 3dda0f304b5d288465070a7a662479411c8ebf52..d7582331bc021c078a9ac68c756746e213ef3827 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/README.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}} - ASP.NET Core 2.0 Server
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Run
 
@@ -25,4 +25,4 @@ cd {{sourceFolder}}/{{packageName}}
 docker build -t {{dockerTag}} .
 docker run -p 5000:8080 {{dockerTag}}
 ```
-{{/isLibrary}}
\ No newline at end of file
+{{/isLibrary}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache
index b17cd6375a4d4699b8533f06ac059c4f2a0fc176..950193f45c81dc3d5868d0af4e76781a64b21e60 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/README.mustache
@@ -1,8 +1,8 @@
 # C++ API client
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [OpenAPI spec](https://openapis.org) from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/csharp-dotnet2/README.mustache b/modules/openapi-generator/src/main/resources/csharp-dotnet2/README.mustache
index 38a2937a4765e5a5a07e862316f952dc2374d983..041dec963b054c5302587cd35695bd0014d4b61f 100644
--- a/modules/openapi-generator/src/main/resources/csharp-dotnet2/README.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-dotnet2/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}} - the C# library for the {{appName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache
index 4ac0fb937855fea1028d098240c6a1d3beefd2c0..7a8d6d3771348bbb6806ac5f74535769dea342e7 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}} - the C# library for the {{appName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/csharp/README.mustache b/modules/openapi-generator/src/main/resources/csharp/README.mustache
index fbf5001b1d275f6e19ab1c7c2e00edc431738a8b..474bfe829b40e3fefbe34d7cd0eb7c307d52fec7 100644
--- a/modules/openapi-generator/src/main/resources/csharp/README.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}} - the C# library for the {{appName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/dart-dio/README.mustache b/modules/openapi-generator/src/main/resources/dart-dio/README.mustache
index 1367a32a5daf7aa3cd16c23bdea86461beeb81e4..b304aca42288bae0995a4ec94f6b687147d95283 100644
--- a/modules/openapi-generator/src/main/resources/dart-dio/README.mustache
+++ b/modules/openapi-generator/src/main/resources/dart-dio/README.mustache
@@ -1,7 +1,7 @@
 # {{pubName}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache
index 4b1c1420e03151d86c455d68f6509e580c9aa440..10a11d931e59a8591395914ab1c527e76fa237c2 100644
--- a/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache
+++ b/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache
@@ -1,7 +1,7 @@
 # {{pubName}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
diff --git a/modules/openapi-generator/src/main/resources/dart/README.mustache b/modules/openapi-generator/src/main/resources/dart/README.mustache
index 02c6cd2116aebcdf72a5920809b41dc12f9014b5..c2052443896b3b7134e33d23a100003ab4c24544 100644
--- a/modules/openapi-generator/src/main/resources/dart/README.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/README.mustache
@@ -1,7 +1,7 @@
 # {{pubName}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/README.mustache b/modules/openapi-generator/src/main/resources/dart2/README.mustache
index 76261fa046738b940da2a16d10c192828066b907..54e7a4efd5f41846198fb6706bff797af4afb028 100644
--- a/modules/openapi-generator/src/main/resources/dart2/README.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/README.mustache
@@ -1,7 +1,7 @@
 # {{pubName}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/elm/README.mustache b/modules/openapi-generator/src/main/resources/elm/README.mustache
index e7190da57b1d38833684454520eabef7e0978c04..932f287c0fae3cbc026eec50b23076d47d056bc2 100644
--- a/modules/openapi-generator/src/main/resources/elm/README.mustache
+++ b/modules/openapi-generator/src/main/resources/elm/README.mustache
@@ -1,9 +1,9 @@
 # Elm API client
 
-{{#appDescription}}
-{{{appDescription}}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
 
-{{/appDescription}}
+{{/appDescriptionWithNewLines}}
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/README.mustache b/modules/openapi-generator/src/main/resources/go-experimental/README.mustache
index 777abc5d06e44497c7e6ae050f2cc3a5cb8b5213..ca2082dc8dc7d9dc223b4fbdaa88c67423b3367c 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/README.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/README.mustache
@@ -1,8 +1,8 @@
 # Go API client for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/go-gin-server/README.mustache b/modules/openapi-generator/src/main/resources/go-gin-server/README.mustache
index 669209a9a84c19be651aa819e81d554f6141c3ea..3ad44c6fa7a78de527dfa6281b9d2c008914fbf0 100644
--- a/modules/openapi-generator/src/main/resources/go-gin-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/go-gin-server/README.mustache
@@ -1,8 +1,8 @@
 # Go API Server for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This server was generated by the [openapi-generator]
diff --git a/modules/openapi-generator/src/main/resources/go-server/README.mustache b/modules/openapi-generator/src/main/resources/go-server/README.mustache
index 14083f758474e364661d9d103fb4c70a1dbf4da1..5a59be673826651eb91c6c1a654f85b6a567f93b 100644
--- a/modules/openapi-generator/src/main/resources/go-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/go-server/README.mustache
@@ -1,8 +1,8 @@
 # Go API Server for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This server was generated by the [openapi-generator]
diff --git a/modules/openapi-generator/src/main/resources/go/README.mustache b/modules/openapi-generator/src/main/resources/go/README.mustache
index b96f612f8a595aebe2ababb6248e3ab211c4a6a1..8f4afa293efbb159dfa9acc96e2b67cfeb0bb083 100644
--- a/modules/openapi-generator/src/main/resources/go/README.mustache
+++ b/modules/openapi-generator/src/main/resources/go/README.mustache
@@ -1,8 +1,8 @@
 # Go API client for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/README.mustache b/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/README.mustache
index 4746e0c95a39e5fa97fd0e9a896ccfc4b8ba866a..2e556cc0666a8ec053ba603f4290ceb4831a3246 100644
--- a/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/README.mustache
@@ -1,8 +1,8 @@
 # GraphQL express API server
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Requirements
 
diff --git a/modules/openapi-generator/src/main/resources/graphql-schema/README.mustache b/modules/openapi-generator/src/main/resources/graphql-schema/README.mustache
index 2b8a89c7a1871eb39e9aa0947ab6cee143e7968e..0ff611e889f580f502ba31addd389d842db0f161 100644
--- a/modules/openapi-generator/src/main/resources/graphql-schema/README.mustache
+++ b/modules/openapi-generator/src/main/resources/graphql-schema/README.mustache
@@ -1,8 +1,8 @@
 # Lua API client for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/lua/README.mustache b/modules/openapi-generator/src/main/resources/lua/README.mustache
index 2b8a89c7a1871eb39e9aa0947ab6cee143e7968e..0ff611e889f580f502ba31addd389d842db0f161 100644
--- a/modules/openapi-generator/src/main/resources/lua/README.mustache
+++ b/modules/openapi-generator/src/main/resources/lua/README.mustache
@@ -1,8 +1,8 @@
 # Lua API client for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://openapis.org) from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/nim-client/README.mustache b/modules/openapi-generator/src/main/resources/nim-client/README.mustache
index f879aee9e0a4b6b003f0f2888c0ef7fb1f05236f..7f664c25e25e4bd60ab6b9025c77b9ab809f41aa 100644
--- a/modules/openapi-generator/src/main/resources/nim-client/README.mustache
+++ b/modules/openapi-generator/src/main/resources/nim-client/README.mustache
@@ -1,8 +1,8 @@
 # Nim API client for {{{appName}}} (Package: {{{packageName}}})
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 
diff --git a/modules/openapi-generator/src/main/resources/objc/README.mustache b/modules/openapi-generator/src/main/resources/objc/README.mustache
index e353062783e7e43feb007c662b4002da42539dc4..a5af6dfd37a9ddb827db68427339bf3be29818b9 100644
--- a/modules/openapi-generator/src/main/resources/objc/README.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/README.mustache
@@ -1,8 +1,8 @@
 # {{podName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This ObjC package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/ocaml/readme.mustache b/modules/openapi-generator/src/main/resources/ocaml/readme.mustache
index 9cd39793a8afb4dc8be1cf1f476b3b626bc6508b..906db4d647aa2f1a93f7b8d77b42e344ae6bc446 100644
--- a/modules/openapi-generator/src/main/resources/ocaml/readme.mustache
+++ b/modules/openapi-generator/src/main/resources/ocaml/readme.mustache
@@ -1,7 +1,7 @@
 # {{{projectName}}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This OCaml package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/perl/README.mustache b/modules/openapi-generator/src/main/resources/perl/README.mustache
index b088e34b852a32ead6334dc059d56812845d4ef9..93707bd1b6e70337c267a4d01d6e1e1ac421dd3e 100644
--- a/modules/openapi-generator/src/main/resources/perl/README.mustache
+++ b/modules/openapi-generator/src/main/resources/perl/README.mustache
@@ -2,7 +2,7 @@
 
 {{moduleName}}::Role - a Moose role for the {{appName}}
 
-{{#appDescription}}{{{appDescription}}}{{/appDescription}}
+{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
 
 # VERSION
 
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/README.mustache b/modules/openapi-generator/src/main/resources/php-symfony/README.mustache
index f107aa4b30cc2712ed640a85b26a3d7ae6169ff1..af53b91e07a23d7edfbccd3de19371369f5ceb07 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/README.mustache
@@ -1,7 +1,7 @@
 # {{bundleName}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This [Symfony](https://symfony.com/) bundle is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/php/README.mustache b/modules/openapi-generator/src/main/resources/php/README.mustache
index 5d6e8c93ef9db5788734c0f04ae83445ef3dc098..636a2a98519fd657eaae3edabd672b4ba41115ae 100644
--- a/modules/openapi-generator/src/main/resources/php/README.mustache
+++ b/modules/openapi-generator/src/main/resources/php/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This PHP package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/powershell/README.mustache b/modules/openapi-generator/src/main/resources/powershell/README.mustache
index 0ff7e5d25f364b00a71ba2a67525b96e674c4871..fae062b7d2b0a60cdf180af436f4ac47a35a5c56 100644
--- a/modules/openapi-generator/src/main/resources/powershell/README.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/README.mustache
@@ -1,8 +1,8 @@
 # {{packageName}} - the PowerShell module for the {{appName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This PowerShell module is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache b/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache
index a516dff1de993177ed0b5a10f16bf604c00e8521..7f8bbe320ebeb0e787a6dcdd4829248377873f6e 100644
--- a/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache
+++ b/modules/openapi-generator/src/main/resources/protobuf-schema/README.mustache
@@ -1,8 +1,8 @@
 # gPRC for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 These files were generated by the [OpenAPI Generator](https://openapi-generator.tech) project. 
diff --git a/modules/openapi-generator/src/main/resources/python/README.mustache b/modules/openapi-generator/src/main/resources/python/README.mustache
index 94d72af33dcda3d843045522c8edd0579288aea2..9d854a4f1b9b4079ffefc25371237cf9c8689732 100644
--- a/modules/openapi-generator/src/main/resources/python/README.mustache
+++ b/modules/openapi-generator/src/main/resources/python/README.mustache
@@ -1,7 +1,7 @@
 # {{{projectName}}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/README.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/README.mustache
index f26408cf661aba87e946f8252d9199131e081aca..72c7f3de3f0446ec8f8f8dfddad70ada94490397 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/README.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/README.mustache
@@ -1,7 +1,7 @@
 # {{{projectName}}}
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
diff --git a/modules/openapi-generator/src/main/resources/r/README.mustache b/modules/openapi-generator/src/main/resources/r/README.mustache
index c9dd12a935f60326211dd3e616e564008d353cbf..5ea739218596c2eb9e3707af4b2f6b1db91b3237 100644
--- a/modules/openapi-generator/src/main/resources/r/README.mustache
+++ b/modules/openapi-generator/src/main/resources/r/README.mustache
@@ -1,8 +1,8 @@
 # R API client for {{packageName}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [OpenAPI spec](https://openapis.org) from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/rust-server/README.mustache b/modules/openapi-generator/src/main/resources/rust-server/README.mustache
index 57146ddc4ca807360a30ec6ca534091f8ff73f41..9ab26d83024cf8695532258f369d4f929a1afacc 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/README.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/README.mustache
@@ -1,8 +1,8 @@
 # Rust API for {{{packageName}}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 
diff --git a/modules/openapi-generator/src/main/resources/rust/README.mustache b/modules/openapi-generator/src/main/resources/rust/README.mustache
index 62aa006644da668ecbb81a6b06a5d17e86242657..89648191073bbf88b642ff44273201af186a17f0 100644
--- a/modules/openapi-generator/src/main/resources/rust/README.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/README.mustache
@@ -1,8 +1,8 @@
 # Rust API client for {{{packageName}}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 
diff --git a/modules/openapi-generator/src/main/resources/scala-akka-client/README.mustache b/modules/openapi-generator/src/main/resources/scala-akka-client/README.mustache
index c684af83ab20389a9d5c3285b25704174c68d278..0a61209568da09f4eeacc40ca2e01e8df7401e77 100644
--- a/modules/openapi-generator/src/main/resources/scala-akka-client/README.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-akka-client/README.mustache
@@ -6,7 +6,7 @@
   - Build date: {{generatedDate}}
 {{/hideGenerationTimestamp}}
 
-{{#appDescription}}{{{appDescription}}}{{/appDescription}}
+{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
 
 {{#infoUrl}}
   For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
@@ -104,4 +104,4 @@ Class | Method | HTTP request | Description
 ## Author
 
 {{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
-{{/hasMore}}{{/apis}}{{/apiInfo}}
\ No newline at end of file
+{{/hasMore}}{{/apis}}{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/scala-httpclient/README.mustache b/modules/openapi-generator/src/main/resources/scala-httpclient/README.mustache
index 045b77f4e866760133cfc61c42e92602689f62da..57673b768dbcd56aac7b2aafb03e4424cf1fa853 100644
--- a/modules/openapi-generator/src/main/resources/scala-httpclient/README.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-httpclient/README.mustache
@@ -2,10 +2,10 @@
 
 {{appName}}
 
-{{#appDescription}}
-{{{appDescription}}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
 
-{{/appDescription}}
+{{/appDescriptionWithNewLines}}
 # VERSION
 
 Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
@@ -128,4 +128,4 @@ you just built.
 ## Author
 
 {{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
-{{/hasMore}}{{/apis}}{{/apiInfo}}
\ No newline at end of file
+{{/hasMore}}{{/apis}}{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/swift4/README.mustache b/modules/openapi-generator/src/main/resources/swift4/README.mustache
index 8fe60510aa888cff41eacf542233484b0d2e07c7..da90d5e1b4482c3f524dd0ddc2b680565a3a7b45 100644
--- a/modules/openapi-generator/src/main/resources/swift4/README.mustache
+++ b/modules/openapi-generator/src/main/resources/swift4/README.mustache
@@ -1,8 +1,8 @@
 # Swift4 API client for {{{projectName}}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
diff --git a/modules/openapi-generator/src/main/resources/swift5/README.mustache b/modules/openapi-generator/src/main/resources/swift5/README.mustache
index c9a27d38b6587e975a05a78068dec17e4ce932f1..6ee7cf37afe92a1c21c59fa227240af8126ac7b4 100644
--- a/modules/openapi-generator/src/main/resources/swift5/README.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/README.mustache
@@ -1,8 +1,8 @@
 # Swift5 API client for {{{projectName}}}
 
-{{#appDescription}}
-{{{appDescription}}}
-{{/appDescription}}
+{{#appDescriptionWithNewLines}}
+{{{appDescriptionWithNewLines}}}
+{{/appDescriptionWithNewLines}}
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.