diff --git a/Helper/ProgressBar.php b/Helper/ProgressBar.php
index 2dac1dfa2..dc3605ad2 100644
--- a/Helper/ProgressBar.php
+++ b/Helper/ProgressBar.php
@@ -229,7 +229,7 @@ public function getEstimated(): float
 
     public function getRemaining(): float
     {
-        if (!$this->step) {
+        if (0 === $this->step || $this->step === $this->startingStep) {
             return 0;
         }
 
@@ -513,12 +513,21 @@ private function overwrite(string $message): void
                 if ($this->output instanceof ConsoleSectionOutput) {
                     $messageLines = explode("\n", $this->previousMessage);
                     $lineCount = \count($messageLines);
+
+                    $lastLineWithoutDecoration = Helper::removeDecoration($this->output->getFormatter(), end($messageLines) ?? '');
+
+                    // When the last previous line is empty (without formatting) it is already cleared by the section output, so we don't need to clear it again
+                    if ('' === $lastLineWithoutDecoration) {
+                        --$lineCount;
+                    }
+
                     foreach ($messageLines as $messageLine) {
                         $messageLineLength = Helper::width(Helper::removeDecoration($this->output->getFormatter(), $messageLine));
                         if ($messageLineLength > $this->terminal->getWidth()) {
                             $lineCount += floor($messageLineLength / $this->terminal->getWidth());
                         }
                     }
+
                     $this->output->clear($lineCount);
                 } else {
                     $lineCount = substr_count($this->previousMessage, "\n");
diff --git a/SignalRegistry/SignalMap.php b/SignalRegistry/SignalMap.php
index de419bda7..2f9aa67c1 100644
--- a/SignalRegistry/SignalMap.php
+++ b/SignalRegistry/SignalMap.php
@@ -27,7 +27,7 @@ public static function getSignalName(int $signal): ?string
         if (!isset(self::$map)) {
             $r = new \ReflectionExtension('pcntl');
             $c = $r->getConstants();
-            $map = array_filter($c, fn ($k) => str_starts_with($k, 'SIG') && !str_starts_with($k, 'SIG_'), \ARRAY_FILTER_USE_KEY);
+            $map = array_filter($c, fn ($k) => str_starts_with($k, 'SIG') && !str_starts_with($k, 'SIG_') && 'SIGBABY' !== $k, \ARRAY_FILTER_USE_KEY);
             self::$map = array_flip($map);
         }
 
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
index 469353505..4f6e6cb96 100644
--- a/Tests/ApplicationTest.php
+++ b/Tests/ApplicationTest.php
@@ -79,6 +79,7 @@ protected function tearDown(): void
             pcntl_signal(\SIGTERM, \SIG_DFL);
             pcntl_signal(\SIGUSR1, \SIG_DFL);
             pcntl_signal(\SIGUSR2, \SIG_DFL);
+            pcntl_signal(\SIGALRM, \SIG_DFL);
         }
     }
 
diff --git a/Tests/ConsoleEventsTest.php b/Tests/ConsoleEventsTest.php
index 9c04d2706..408f8c0d3 100644
--- a/Tests/ConsoleEventsTest.php
+++ b/Tests/ConsoleEventsTest.php
@@ -39,6 +39,7 @@ protected function tearDown(): void
             pcntl_signal(\SIGTERM, \SIG_DFL);
             pcntl_signal(\SIGUSR1, \SIG_DFL);
             pcntl_signal(\SIGUSR2, \SIG_DFL);
+            pcntl_signal(\SIGALRM, \SIG_DFL);
         }
     }
 
diff --git a/Tests/Helper/ProgressBarTest.php b/Tests/Helper/ProgressBarTest.php
index 88b3e9228..0df42e738 100644
--- a/Tests/Helper/ProgressBarTest.php
+++ b/Tests/Helper/ProgressBarTest.php
@@ -110,6 +110,16 @@ public function testRegularTimeEstimation()
         );
     }
 
+    public function testRegularTimeRemainingWithDifferentStartAtAndCustomDisplay()
+    {
+        $this->expectNotToPerformAssertions();
+
+        ProgressBar::setFormatDefinition('custom', ' %current%/%max% [%bar%] %percent:3s%% %remaining% %estimated%');
+        $bar = new ProgressBar($this->getOutputStream(), 1_200, 0);
+        $bar->setFormat('custom');
+        $bar->start(1_200, 600);
+    }
+
     public function testResumedTimeEstimation()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);
@@ -406,6 +416,81 @@ public function testOverwriteWithSectionOutput()
         );
     }
 
+    public function testOverwriteWithSectionOutputAndEol()
+    {
+        $sections = [];
+        $stream = $this->getOutputStream(true);
+        $output = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+
+        $bar = new ProgressBar($output, 50, 0);
+        $bar->setFormat('[%bar%] %percent:3s%%' . PHP_EOL . '%message%' . PHP_EOL);
+        $bar->setMessage('');
+        $bar->start();
+        $bar->display();
+        $bar->setMessage('Doing something...');
+        $bar->advance();
+        $bar->setMessage('Doing something foo...');
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(escapeshellcmd(
+            '[>---------------------------]   0%'.\PHP_EOL.\PHP_EOL.
+            "\x1b[2A\x1b[0J".'[>---------------------------]   2%'.\PHP_EOL. 'Doing something...' . \PHP_EOL .
+            "\x1b[2A\x1b[0J".'[=>--------------------------]   4%'.\PHP_EOL. 'Doing something foo...' . \PHP_EOL),
+            escapeshellcmd(stream_get_contents($output->getStream()))
+        );
+    }
+
+    public function testOverwriteWithSectionOutputAndEolWithEmptyMessage()
+    {
+        $sections = [];
+        $stream = $this->getOutputStream(true);
+        $output = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+
+        $bar = new ProgressBar($output, 50, 0);
+        $bar->setFormat('[%bar%] %percent:3s%%' . PHP_EOL . '%message%');
+        $bar->setMessage('Start');
+        $bar->start();
+        $bar->display();
+        $bar->setMessage('');
+        $bar->advance();
+        $bar->setMessage('Doing something...');
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(escapeshellcmd(
+            '[>---------------------------]   0%'.\PHP_EOL.'Start'.\PHP_EOL.
+            "\x1b[2A\x1b[0J".'[>---------------------------]   2%'.\PHP_EOL .
+            "\x1b[1A\x1b[0J".'[=>--------------------------]   4%'.\PHP_EOL. 'Doing something...' . \PHP_EOL),
+            escapeshellcmd(stream_get_contents($output->getStream()))
+        );
+    }
+
+    public function testOverwriteWithSectionOutputAndEolWithEmptyMessageComment()
+    {
+        $sections = [];
+        $stream = $this->getOutputStream(true);
+        $output = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+
+        $bar = new ProgressBar($output, 50, 0);
+        $bar->setFormat('[%bar%] %percent:3s%%' . PHP_EOL . '<comment>%message%</comment>');
+        $bar->setMessage('Start');
+        $bar->start();
+        $bar->display();
+        $bar->setMessage('');
+        $bar->advance();
+        $bar->setMessage('Doing something...');
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(escapeshellcmd(
+            '[>---------------------------]   0%'.\PHP_EOL."\x1b[33mStart\x1b[39m".\PHP_EOL.
+            "\x1b[2A\x1b[0J".'[>---------------------------]   2%'.\PHP_EOL .
+            "\x1b[1A\x1b[0J".'[=>--------------------------]   4%'.\PHP_EOL. "\x1b[33mDoing something...\x1b[39m" . \PHP_EOL),
+            escapeshellcmd(stream_get_contents($output->getStream()))
+        );
+    }
+
     public function testOverwriteWithAnsiSectionOutput()
     {
         // output has 43 visible characters plus 2 invisible ANSI characters
diff --git a/Tests/SignalRegistry/SignalMapTest.php b/Tests/SignalRegistry/SignalMapTest.php
index 887c5d7af..f4e320477 100644
--- a/Tests/SignalRegistry/SignalMapTest.php
+++ b/Tests/SignalRegistry/SignalMapTest.php
@@ -22,6 +22,7 @@ class SignalMapTest extends TestCase
      * @testWith [2, "SIGINT"]
      *           [9, "SIGKILL"]
      *           [15, "SIGTERM"]
+     *           [31, "SIGSYS"]
      */
     public function testSignalExists(int $signal, string $expected)
     {
diff --git a/Tests/SignalRegistry/SignalRegistryTest.php b/Tests/SignalRegistry/SignalRegistryTest.php
index f997f7c1d..92d500f9e 100644
--- a/Tests/SignalRegistry/SignalRegistryTest.php
+++ b/Tests/SignalRegistry/SignalRegistryTest.php
@@ -27,6 +27,7 @@ protected function tearDown(): void
         pcntl_signal(\SIGTERM, \SIG_DFL);
         pcntl_signal(\SIGUSR1, \SIG_DFL);
         pcntl_signal(\SIGUSR2, \SIG_DFL);
+        pcntl_signal(\SIGALRM, \SIG_DFL);
     }
 
     public function testOneCallbackForASignalSignalIsHandled()