diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5b91c75f..c45457abc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
      - Fixes 3992: Table plugin not checking for valid phantom nodes
      - Fixes 4013: `continue_straight` interaction with bearing constraints
      - Fixes 4063: Potential overflow in custom profiles for restricted ways
+     - Fixes 4030: Roundabout edge-case crashes post-processing
 
 # 5.7.0
   - Changes from 5.6
diff --git a/features/guidance/roundabout.feature b/features/guidance/roundabout.feature
index b118ab34e..60dbe5fca 100644
--- a/features/guidance/roundabout.feature
+++ b/features/guidance/roundabout.feature
@@ -794,7 +794,9 @@ Feature: Basic Roundabout
             | k    | l  | kg,hl,hl | depart,roundabout-exit-1,arrive | 80.1m    |
             | l    | k  | hl,kg,kg | depart,roundabout-exit-1,arrive | 120.1m   |
 
+    @4030 @4075
     Scenario: Service roundabout with service exits
+      # Counting of service exits must be adjusted in #4075
         Given the node map
             """
                 e