diff --git a/src/jvmTest/java/org/snakeyaml/engine/v2/comments/EmitterWithCommentEnabledTest.java b/src/jvmTest/java/org/snakeyaml/engine/v2/comments/EmitterWithCommentEnabledTest.java
index 4565cf377..f180d930e 100644
--- a/src/jvmTest/java/org/snakeyaml/engine/v2/comments/EmitterWithCommentEnabledTest.java
+++ b/src/jvmTest/java/org/snakeyaml/engine/v2/comments/EmitterWithCommentEnabledTest.java
@@ -281,6 +281,16 @@ public void testCommentsIndentFirstLineBlank() throws Exception {
     assertEquals(data, result);
   }
 
+  @Test
+  public void testCommentsLineBlank() throws Exception {
+    String data = "# Comment 1\n" + "key1:\n" + "  \n" + "  # Comment 2\n" + "\n" + "  # Comment 3\n" + "\n"
+      + "  key2: value1\n" + "# \"Fun\" options\n" + "key3:\n" + "  # Comment 4\n"
+      + "  # Comment 5\n" + "  key4: value2\n" + "key5:\n" + "  key6: value3\n";
+
+    String result = runEmitterWithCommentsEnabled(data);
+    assertEquals(data, result);
+  }
+
   @Test
   public void testMultiLineString() throws Exception {
     String data = "# YAML load and save bug with keep block chomping indicator\n" + "example:\n"
diff --git a/upstream-commit.txt b/upstream-commit.txt
index 98817c43b..34a9f1601 100644
--- a/upstream-commit.txt
+++ b/upstream-commit.txt
@@ -1 +1 @@
-8af4b3befe5ede130782db3386e1b370aded3104
+cf808a16bff0eb531a48debcd04be0aab562c21e