diff --git a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
index e3fecc468f..35b5831fa1 100644
--- a/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
@@ -69,7 +69,7 @@ public function render(array $css_assets) {
         'rel' => 'stylesheet',
       ],
       // Add a linebreak for nicer meta tag output.
-      '#nonewline' => FALSE,
+      '#suffix' => "\n",
     ];
 
     foreach ($css_assets as $css_asset) {
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
index 3f4be433ad..1117d34ba9 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
@@ -75,7 +75,7 @@ public function render(array $js_assets) {
       '#tag' => 'script',
       '#value' => '',
       // Add a linebreak for nicer meta tag output.
-      '#nonewline' => FALSE,
+      '#suffix' => "\n",
     ];
 
     // Loop through all JS assets.
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 1b363a04cc..38ad359088 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -77,8 +77,6 @@ public function getInfo() {
    *   - #noscript: (optional) If TRUE, the markup (including any prefix or
    *     suffix) will be wrapped in a <noscript> element. (Note that passing
    *     any non-empty value here will add the <noscript> tag.)
-   *   - #nonewline: (optional) When set FALSE (current default), the markup
-   *     will be appended with a "\n" (new line) at the end.
    *
    * @return array
    */
@@ -93,6 +91,7 @@ public static function preRenderHtmlTag($element) {
     // Construct a void element.
     if (in_array($element['#tag'], self::$voidElements)) {
       $open_tag .= ' />';
+      $close_tag = '';
     }
     // Construct all other elements.
     else {
@@ -107,12 +106,15 @@ public static function preRenderHtmlTag($element) {
         $element['#markup'] = Markup::create(Xss::filterAdmin($element['#value']));
       }
     }
-    // @todo Consider to change default behaviour in Drupal 10.
-    if (empty($element['#nonewline'])) {
-      $close_tag .= "\n";
-    }
     $prefix = isset($element['#prefix']) ? $element['#prefix'] . $open_tag : $open_tag;
-    $suffix = isset($element['#suffix']) ? $close_tag . $element['#suffix'] : $close_tag;
+    if (isset($element['#suffix'])) {
+      $suffix = $close_tag . $element['#suffix'];
+    }
+    else {
+      $suffix = $close_tag . "\n";
+      @trigger_error('Addition of newline to HTML tags is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Set #suffix to "\\n" to keep the existing behaviour. See https://www.drupal.org/node/2742955', E_USER_DEPRECATED);
+
+    }
     if (!empty($element['#noscript'])) {
       $prefix = '<noscript>' . $prefix;
       $suffix .= '</noscript>';
diff --git a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
index 766db6a444..4336c71db8 100644
--- a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
+++ b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
@@ -446,7 +446,7 @@ protected function processHtmlHeadLink(array $html_head_link) {
         '#tag' => 'link',
         '#attributes' => $attributes,
         // Add a linebreak for nicer meta tag output.
-        '#nonewline' => FALSE,
+        '#suffix' => "\n",
       ];
       $href = $attributes['href'];
       $rel = $attributes['rel'];
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index e6a0ef5992..7e8e915bdc 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -665,7 +665,7 @@ function system_page_attachments(array &$page) {
   ];
   foreach ($meta_default as $key => $value) {
     // Add a linebreak for nicer meta tag output.
-    $value['#nonewline'] = FALSE;
+    $value['#suffix'] = "\n";
     $page['#attached']['html_head'][] = [$value, $key];
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index 8f29eff1af..7743e6a565 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -89,6 +89,8 @@ public function providerTestRender() {
         '#type' => 'html_tag',
         '#tag' => 'link',
         '#attributes' => array_replace($attributes, $custom_attributes),
+        // Add a linebreak for nicer meta tag output.
+        '#suffix' => "\n",
       ];
     };
 
diff --git a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
index cca68a32c6..8d9432cdd0 100644
--- a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
@@ -64,7 +64,7 @@ public function providerPreRenderHtmlTag() {
     $tags['void-element'] = [$element, "<br />\n"];
 
     // No new line option.
-    $element['#nonewline'] = TRUE;
+    $element['#suffix'] = '';
     $tags['void-element-nonewline'] = [$element, '<br />'];
 
     // Attributes.
@@ -80,7 +80,7 @@ public function providerPreRenderHtmlTag() {
     $tags['noscript'] = [$element, '<noscript><div class="test" id="id">value</div>' . "\n" . '</noscript>'];
 
     // Combined with no new line option.
-    $element['#nonewline'] = TRUE;
+    $element['#suffix'] = '';
     $tags['noscript-nonewline'] = [$element, '<noscript><div class="test" id="id">value</div></noscript>'];
 
     // Ensure that #tag is sanitized.