diff --git a/eeschema/erc/erc_report.cpp b/eeschema/erc/erc_report.cpp
index 4e8d81d177..1ab459aafc 100644
--- a/eeschema/erc/erc_report.cpp
+++ b/eeschema/erc/erc_report.cpp
@@ -59,18 +59,29 @@ wxString ERC_REPORT::GetTextReport()
 
     ERC_SETTINGS& settings = m_sch->ErcSettings();
 
+    SHEETLIST_ERC_ITEMS_PROVIDER errors( m_sch );
+    errors.SetSeverities( RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING );
+
+    std::map<SCH_SHEET_PATH, std::vector<ERC_ITEM*>> orderedItems;
+
+    for( int i = 0; i < errors.GetCount(); ++i )
+    {
+        if( auto item = dynamic_cast<ERC_ITEM*>( errors.GetItem( i ).get() ) )
+        {
+            if( item->MainItemHasSheetPath() )
+                orderedItems[item->GetMainItemSheetPath()].emplace_back( item );
+            else
+                orderedItems[sheetList[0]].emplace_back( item );
+        }
+    }
+
     for( unsigned i = 0; i < sheetList.size(); i++ )
     {
         msg << wxString::Format( _( "\n***** Sheet %s\n" ), sheetList[i].PathHumanReadable() );
 
-        for( SCH_ITEM* aItem : sheetList[i].LastScreen()->Items().OfType( SCH_MARKER_T ) )
+        for( ERC_ITEM* item : orderedItems[sheetList[i]] )
         {
-            const SCH_MARKER* marker = static_cast<const SCH_MARKER*>( aItem );
-            RC_ITEM*          item = marker->GetRCItem().get();
-            SEVERITY          severity = settings.GetSeverity( item->GetErrorCode() );
-
-            if( marker->GetMarkerType() != MARKER_BASE::MARKER_ERC )
-                continue;
+            SEVERITY severity = settings.GetSeverity( item->GetErrorCode() );
 
             total_count++;
 
@@ -81,7 +92,7 @@ wxString ERC_REPORT::GetTextReport()
             default: break;
             }
 
-            msg << marker->GetRCItem()->ShowReport( &unitsProvider, severity, itemMap );
+            msg << item->ShowReport( &unitsProvider, severity, itemMap );
         }
     }
 
@@ -126,23 +137,34 @@ bool ERC_REPORT::WriteJsonReport( const wxString& aFullFileName )
 
     ERC_SETTINGS& settings = m_sch->ErcSettings();
 
+    SHEETLIST_ERC_ITEMS_PROVIDER errors( m_sch );
+    errors.SetSeverities( RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING );
+
+    std::map<SCH_SHEET_PATH, std::vector<ERC_ITEM*>> orderedItems;
+
+    for( int i = 0; i < errors.GetCount(); ++i )
+    {
+        if( auto item = dynamic_cast<ERC_ITEM*>( errors.GetItem( i ).get() ) )
+        {
+            if( item->MainItemHasSheetPath() )
+                orderedItems[item->GetMainItemSheetPath()].emplace_back( item );
+            else
+                orderedItems[sheetList[0]].emplace_back( item );
+        }
+    }
+
     for( unsigned i = 0; i < sheetList.size(); i++ )
     {
         RC_JSON::ERC_SHEET jsonSheet;
         jsonSheet.path = sheetList[i].PathHumanReadable();
         jsonSheet.uuid_path = sheetList[i].Path().AsString();
 
-        for( SCH_ITEM* aItem : sheetList[i].LastScreen()->Items().OfType( SCH_MARKER_T ) )
+        for( ERC_ITEM* item : orderedItems[sheetList[i]] )
         {
-            const SCH_MARKER* marker = static_cast<const SCH_MARKER*>( aItem );
-            RC_ITEM*          item = marker->GetRCItem().get();
-            SEVERITY          severity = settings.GetSeverity( item->GetErrorCode() );
-
-            if( marker->GetMarkerType() != MARKER_BASE::MARKER_ERC )
-                continue;
+            SEVERITY severity = settings.GetSeverity( item->GetErrorCode() );
 
             RC_JSON::VIOLATION violation;
-            marker->GetRCItem()->GetJsonViolation( violation, &unitsProvider, severity, itemMap );
+            item->GetJsonViolation( violation, &unitsProvider, severity, itemMap );
 
             jsonSheet.violations.push_back( violation );
         }
diff --git a/eeschema/erc/erc_settings.cpp b/eeschema/erc/erc_settings.cpp
index 7e83e3e0a3..6b2baa5694 100644
--- a/eeschema/erc/erc_settings.cpp
+++ b/eeschema/erc/erc_settings.cpp
@@ -319,6 +319,20 @@ void ERC_SETTINGS::ResetPinMap()
 }
 
 
+struct CompareMarkers
+{
+    bool operator()( const SCH_MARKER* item1, const SCH_MARKER* item2 ) const
+    {
+        wxCHECK( item1 && item2, false );
+
+        if( item1->GetPosition() == item2->GetPosition() )
+            return item1->SerializeToString() < item2->SerializeToString();
+
+        return item1->GetPosition() < item2->GetPosition();
+    }
+};
+
+
 void SHEETLIST_ERC_ITEMS_PROVIDER::visitMarkers( std::function<void( SCH_MARKER* )> aVisitor ) const
 {
     std::set<SCH_SCREEN*> seenScreens;
@@ -330,7 +344,12 @@ void SHEETLIST_ERC_ITEMS_PROVIDER::visitMarkers( std::function<void( SCH_MARKER*
         if( firstTime )
             seenScreens.insert( sheet.LastScreen() );
 
+        std::set<SCH_MARKER*, CompareMarkers> orderedMarkers;
+
         for( SCH_ITEM* item : sheet.LastScreen()->Items().OfType( SCH_MARKER_T ) )
+            orderedMarkers.insert( static_cast<SCH_MARKER*>( item ) );
+
+        for( SCH_ITEM* item : orderedMarkers )
         {
             SCH_MARKER* marker = static_cast<SCH_MARKER*>( item );
 
diff --git a/qa/data/cli/basic_test/basic_test.erc.json b/qa/data/cli/basic_test/basic_test.erc.json
index d38b47fcd4..a070b55b24 100644
--- a/qa/data/cli/basic_test/basic_test.erc.json
+++ b/qa/data/cli/basic_test/basic_test.erc.json
@@ -8,6 +8,171 @@
             "path": "/",
             "uuid_path": "/64c481bc-ea0a-4f9c-a176-3729f4987c58",
             "violations": [
+                {
+                    "description": "Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.",
+                    "items": [
+                        {
+                            "description": "Symbol J1 [Conn_01x01_Pin]",
+                            "pos": {
+                                "x": 1.0541,
+                                "y": 0.635
+                            },
+                            "uuid": "203ec3c1-122c-4087-8f6d-2a0dd0b941e6"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "footprint_link_issues"
+                },
+                {
+                    "description": "The current configuration does not include the symbol library 'Connector'",
+                    "items": [
+                        {
+                            "description": "Symbol J1 [Conn_01x01_Pin]",
+                            "pos": {
+                                "x": 1.0541,
+                                "y": 0.635
+                            },
+                            "uuid": "203ec3c1-122c-4087-8f6d-2a0dd0b941e6"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "lib_symbol_issues"
+                },
+                {
+                    "description": "Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.",
+                    "items": [
+                        {
+                            "description": "Symbol J2 [Conn_01x01_Pin]",
+                            "pos": {
+                                "x": 1.0541,
+                                "y": 0.762
+                            },
+                            "uuid": "2a9f5f63-d864-4898-ae3e-539c635e8f2c"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "footprint_link_issues"
+                },
+                {
+                    "description": "The current configuration does not include the symbol library 'Connector'",
+                    "items": [
+                        {
+                            "description": "Symbol J2 [Conn_01x01_Pin]",
+                            "pos": {
+                                "x": 1.0541,
+                                "y": 0.762
+                            },
+                            "uuid": "2a9f5f63-d864-4898-ae3e-539c635e8f2c"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "lib_symbol_issues"
+                },
+                {
+                    "description": "Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.",
+                    "items": [
+                        {
+                            "description": "Symbol R3 [R_US]",
+                            "pos": {
+                                "x": 1.1557,
+                                "y": 0.762
+                            },
+                            "uuid": "985a669c-9a7f-4b74-bb4f-9487b164d3aa"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "footprint_link_issues"
+                },
+                {
+                    "description": "Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.",
+                    "items": [
+                        {
+                            "description": "Symbol J4 [Conn_01x01_Pin]",
+                            "pos": {
+                                "x": 1.0541,
+                                "y": 0.9906
+                            },
+                            "uuid": "789295bb-2cfb-4a2b-977f-b3831d5aa975"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "footprint_link_issues"
+                },
+                {
+                    "description": "The current configuration does not include the symbol library 'Connector'",
+                    "items": [
+                        {
+                            "description": "Symbol J4 [Conn_01x01_Pin]",
+                            "pos": {
+                                "x": 1.0541,
+                                "y": 0.9906
+                            },
+                            "uuid": "789295bb-2cfb-4a2b-977f-b3831d5aa975"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "lib_symbol_issues"
+                },
+                {
+                    "description": "Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'.",
+                    "items": [
+                        {
+                            "description": "Symbol C1 [C_Small]",
+                            "pos": {
+                                "x": 1.2192,
+                                "y": 0.8001
+                            },
+                            "uuid": "8a4f4d93-4e0c-474b-8535-68c4fef6e828"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "footprint_link_issues"
+                },
+                {
+                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
+                    "items": [
+                        {
+                            "description": "Symbol #PWR03 [GND]",
+                            "pos": {
+                                "x": 1.2192,
+                                "y": 0.8382
+                            },
+                            "uuid": "5d9a8cf4-5c54-4c57-accb-dd6295272287"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "lib_symbol_mismatch"
+                },
+                {
+                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
+                    "items": [
+                        {
+                            "description": "Symbol #PWR04 [GND]",
+                            "pos": {
+                                "x": 1.1176,
+                                "y": 1.0033
+                            },
+                            "uuid": "a45b22f2-0929-43b6-b1fb-e2272cb68106"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "lib_symbol_mismatch"
+                },
+                {
+                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
+                    "items": [
+                        {
+                            "description": "Symbol #PWR01 [GND]",
+                            "pos": {
+                                "x": 1.1938,
+                                "y": 0.9652
+                            },
+                            "uuid": "19ba0538-2910-44b8-9336-edf1ff095912"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "lib_symbol_mismatch"
+                },
                 {
                     "description": "Input Power pin not driven by any Output Power pins",
                     "items": [
@@ -23,6 +188,51 @@
                     "severity": "error",
                     "type": "power_pin_not_driven"
                 },
+                {
+                    "description": "Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.",
+                    "items": [
+                        {
+                            "description": "Symbol R1 [R_US]",
+                            "pos": {
+                                "x": 1.27,
+                                "y": 0.9398
+                            },
+                            "uuid": "eaf8668d-aec7-4209-a3f9-fc7bfb5b931b"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "footprint_link_issues"
+                },
+                {
+                    "description": "Footprint 'SOT-23-5' not found in library 'Package_TO_SOT_SMD'.",
+                    "items": [
+                        {
+                            "description": "Symbol U1 [TLV2371DBV]",
+                            "pos": {
+                                "x": 1.4351,
+                                "y": 0.7874
+                            },
+                            "uuid": "b8a40376-5e4f-459f-9886-5e9ee83698cf"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "footprint_link_issues"
+                },
+                {
+                    "description": "The current configuration does not include the symbol library 'Amplifier_Operational'",
+                    "items": [
+                        {
+                            "description": "Symbol U1 [TLV2371DBV]",
+                            "pos": {
+                                "x": 1.4351,
+                                "y": 0.7874
+                            },
+                            "uuid": "b8a40376-5e4f-459f-9886-5e9ee83698cf"
+                        }
+                    ],
+                    "severity": "warning",
+                    "type": "lib_symbol_issues"
+                },
                 {
                     "description": "Input Power pin not driven by any Output Power pins",
                     "items": [
@@ -68,51 +278,6 @@
                     "severity": "warning",
                     "type": "footprint_link_issues"
                 },
-                {
-                    "description": "The current configuration does not include the symbol library 'Connector'",
-                    "items": [
-                        {
-                            "description": "Symbol J3 [Conn_01x01_Pin]",
-                            "pos": {
-                                "x": 1.778,
-                                "y": 0.7874
-                            },
-                            "uuid": "9efa520e-00e1-47a2-b8dc-bf8e2121d065"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_issues"
-                },
-                {
-                    "description": "The current configuration does not include the symbol library 'Amplifier_Operational'",
-                    "items": [
-                        {
-                            "description": "Symbol U1 [TLV2371DBV]",
-                            "pos": {
-                                "x": 1.4351,
-                                "y": 0.7874
-                            },
-                            "uuid": "b8a40376-5e4f-459f-9886-5e9ee83698cf"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_issues"
-                },
-                {
-                    "description": "Footprint 'SOT-23-5' not found in library 'Package_TO_SOT_SMD'.",
-                    "items": [
-                        {
-                            "description": "Symbol U1 [TLV2371DBV]",
-                            "pos": {
-                                "x": 1.4351,
-                                "y": 0.7874
-                            },
-                            "uuid": "b8a40376-5e4f-459f-9886-5e9ee83698cf"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "footprint_link_issues"
-                },
                 {
                     "description": "Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.",
                     "items": [
@@ -132,181 +297,16 @@
                     "description": "The current configuration does not include the symbol library 'Connector'",
                     "items": [
                         {
-                            "description": "Symbol J2 [Conn_01x01_Pin]",
+                            "description": "Symbol J3 [Conn_01x01_Pin]",
                             "pos": {
-                                "x": 1.0541,
-                                "y": 0.762
+                                "x": 1.778,
+                                "y": 0.7874
                             },
-                            "uuid": "2a9f5f63-d864-4898-ae3e-539c635e8f2c"
+                            "uuid": "9efa520e-00e1-47a2-b8dc-bf8e2121d065"
                         }
                     ],
                     "severity": "warning",
                     "type": "lib_symbol_issues"
-                },
-                {
-                    "description": "The current configuration does not include the symbol library 'Connector'",
-                    "items": [
-                        {
-                            "description": "Symbol J1 [Conn_01x01_Pin]",
-                            "pos": {
-                                "x": 1.0541,
-                                "y": 0.635
-                            },
-                            "uuid": "203ec3c1-122c-4087-8f6d-2a0dd0b941e6"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_issues"
-                },
-                {
-                    "description": "Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.",
-                    "items": [
-                        {
-                            "description": "Symbol J1 [Conn_01x01_Pin]",
-                            "pos": {
-                                "x": 1.0541,
-                                "y": 0.635
-                            },
-                            "uuid": "203ec3c1-122c-4087-8f6d-2a0dd0b941e6"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "footprint_link_issues"
-                },
-                {
-                    "description": "Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.",
-                    "items": [
-                        {
-                            "description": "Symbol R3 [R_US]",
-                            "pos": {
-                                "x": 1.1557,
-                                "y": 0.762
-                            },
-                            "uuid": "985a669c-9a7f-4b74-bb4f-9487b164d3aa"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "footprint_link_issues"
-                },
-                {
-                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
-                    "items": [
-                        {
-                            "description": "Symbol #PWR01 [GND]",
-                            "pos": {
-                                "x": 1.1938,
-                                "y": 0.9652
-                            },
-                            "uuid": "19ba0538-2910-44b8-9336-edf1ff095912"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_mismatch"
-                },
-                {
-                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
-                    "items": [
-                        {
-                            "description": "Symbol #PWR04 [GND]",
-                            "pos": {
-                                "x": 1.1176,
-                                "y": 1.0033
-                            },
-                            "uuid": "a45b22f2-0929-43b6-b1fb-e2272cb68106"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_mismatch"
-                },
-                {
-                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
-                    "items": [
-                        {
-                            "description": "Symbol #PWR03 [GND]",
-                            "pos": {
-                                "x": 1.2192,
-                                "y": 0.8382
-                            },
-                            "uuid": "5d9a8cf4-5c54-4c57-accb-dd6295272287"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_mismatch"
-                },
-                {
-                    "description": "Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.",
-                    "items": [
-                        {
-                            "description": "Symbol R1 [R_US]",
-                            "pos": {
-                                "x": 1.27,
-                                "y": 0.9398
-                            },
-                            "uuid": "eaf8668d-aec7-4209-a3f9-fc7bfb5b931b"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "footprint_link_issues"
-                },
-                {
-                    "description": "Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'.",
-                    "items": [
-                        {
-                            "description": "Symbol C1 [C_Small]",
-                            "pos": {
-                                "x": 1.2192,
-                                "y": 0.8001
-                            },
-                            "uuid": "8a4f4d93-4e0c-474b-8535-68c4fef6e828"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "footprint_link_issues"
-                },
-                {
-                    "description": "The current configuration does not include the symbol library 'Connector'",
-                    "items": [
-                        {
-                            "description": "Symbol J4 [Conn_01x01_Pin]",
-                            "pos": {
-                                "x": 1.0541,
-                                "y": 0.9906
-                            },
-                            "uuid": "789295bb-2cfb-4a2b-977f-b3831d5aa975"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_issues"
-                },
-                {
-                    "description": "Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.",
-                    "items": [
-                        {
-                            "description": "Symbol J2 [Conn_01x01_Pin]",
-                            "pos": {
-                                "x": 1.0541,
-                                "y": 0.762
-                            },
-                            "uuid": "2a9f5f63-d864-4898-ae3e-539c635e8f2c"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "footprint_link_issues"
-                },
-                {
-                    "description": "Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.",
-                    "items": [
-                        {
-                            "description": "Symbol J4 [Conn_01x01_Pin]",
-                            "pos": {
-                                "x": 1.0541,
-                                "y": 0.9906
-                            },
-                            "uuid": "789295bb-2cfb-4a2b-977f-b3831d5aa975"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "footprint_link_issues"
                 }
             ]
         }
diff --git a/qa/data/cli/basic_test/basic_test.erc.rpt b/qa/data/cli/basic_test/basic_test.erc.rpt
index d77558fc6f..8ceb7e47fe 100644
--- a/qa/data/cli/basic_test/basic_test.erc.rpt
+++ b/qa/data/cli/basic_test/basic_test.erc.rpt
@@ -1,9 +1,51 @@
 ERC report (2025-02-22T10:24:58-0500, Encoding UTF8)
 
 ***** Sheet /
+[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
+    ; warning
+    @(105.41 mm, 63.50 mm): Symbol J1 [Conn_01x01_Pin]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
+    ; warning
+    @(105.41 mm, 63.50 mm): Symbol J1 [Conn_01x01_Pin]
+[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
+    ; warning
+    @(105.41 mm, 76.20 mm): Symbol J2 [Conn_01x01_Pin]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
+    ; warning
+    @(105.41 mm, 76.20 mm): Symbol J2 [Conn_01x01_Pin]
+[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
+    ; warning
+    @(115.57 mm, 76.20 mm): Symbol R3 [R_US]
+[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
+    ; warning
+    @(105.41 mm, 99.06 mm): Symbol J4 [Conn_01x01_Pin]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
+    ; warning
+    @(105.41 mm, 99.06 mm): Symbol J4 [Conn_01x01_Pin]
+[footprint_link_issues]: Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'.
+    ; warning
+    @(121.92 mm, 80.01 mm): Symbol C1 [C_Small]
+[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
+    ; warning
+    @(121.92 mm, 83.82 mm): Symbol #PWR03 [GND]
+[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
+    ; warning
+    @(111.76 mm, 100.33 mm): Symbol #PWR04 [GND]
+[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
+    ; warning
+    @(119.38 mm, 96.52 mm): Symbol #PWR01 [GND]
 [power_pin_not_driven]: Input Power pin not driven by any Output Power pins
     ; error
     @(140.97 mm, 71.12 mm): Symbol U1 Pin 5 [V+, Power input, Line]
+[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
+    ; warning
+    @(127.00 mm, 93.98 mm): Symbol R1 [R_US]
+[footprint_link_issues]: Footprint 'SOT-23-5' not found in library 'Package_TO_SOT_SMD'.
+    ; warning
+    @(143.51 mm, 78.74 mm): Symbol U1 [TLV2371DBV]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Amplifier_Operational'
+    ; warning
+    @(143.51 mm, 78.74 mm): Symbol U1 [TLV2371DBV]
 [power_pin_not_driven]: Input Power pin not driven by any Output Power pins
     ; error
     @(140.97 mm, 86.36 mm): Symbol U1 Pin 2 [V-, Power input, Line]
@@ -13,53 +55,11 @@ ERC report (2025-02-22T10:24:58-0500, Encoding UTF8)
 [footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
     ; warning
     @(149.86 mm, 93.98 mm): Symbol R2 [R_US]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
-    ; warning
-    @(177.80 mm, 78.74 mm): Symbol J3 [Conn_01x01_Pin]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Amplifier_Operational'
-    ; warning
-    @(143.51 mm, 78.74 mm): Symbol U1 [TLV2371DBV]
-[footprint_link_issues]: Footprint 'SOT-23-5' not found in library 'Package_TO_SOT_SMD'.
-    ; warning
-    @(143.51 mm, 78.74 mm): Symbol U1 [TLV2371DBV]
 [footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
     ; warning
     @(177.80 mm, 78.74 mm): Symbol J3 [Conn_01x01_Pin]
 [lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
     ; warning
-    @(105.41 mm, 76.20 mm): Symbol J2 [Conn_01x01_Pin]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
-    ; warning
-    @(105.41 mm, 63.50 mm): Symbol J1 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
-    ; warning
-    @(105.41 mm, 63.50 mm): Symbol J1 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
-    ; warning
-    @(115.57 mm, 76.20 mm): Symbol R3 [R_US]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(119.38 mm, 96.52 mm): Symbol #PWR01 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(111.76 mm, 100.33 mm): Symbol #PWR04 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(121.92 mm, 83.82 mm): Symbol #PWR03 [GND]
-[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
-    ; warning
-    @(127.00 mm, 93.98 mm): Symbol R1 [R_US]
-[footprint_link_issues]: Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'.
-    ; warning
-    @(121.92 mm, 80.01 mm): Symbol C1 [C_Small]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
-    ; warning
-    @(105.41 mm, 99.06 mm): Symbol J4 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
-    ; warning
-    @(105.41 mm, 76.20 mm): Symbol J2 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
-    ; warning
-    @(105.41 mm, 99.06 mm): Symbol J4 [Conn_01x01_Pin]
+    @(177.80 mm, 78.74 mm): Symbol J3 [Conn_01x01_Pin]
 
  ** ERC messages: 20  Errors 2  Warnings 18
diff --git a/qa/data/cli/basic_test/basic_test.erc.unitsin.rpt b/qa/data/cli/basic_test/basic_test.erc.unitsin.rpt
index e45478dd99..392df4843d 100644
--- a/qa/data/cli/basic_test/basic_test.erc.unitsin.rpt
+++ b/qa/data/cli/basic_test/basic_test.erc.unitsin.rpt
@@ -1,9 +1,51 @@
 ERC report (2025-02-22T10:28:19-0500, Encoding UTF8)
 
 ***** Sheet /
+[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
+    ; warning
+    @(4.150 in, 2.500 in): Symbol J1 [Conn_01x01_Pin]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
+    ; warning
+    @(4.150 in, 2.500 in): Symbol J1 [Conn_01x01_Pin]
+[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
+    ; warning
+    @(4.150 in, 3.000 in): Symbol J2 [Conn_01x01_Pin]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
+    ; warning
+    @(4.150 in, 3.000 in): Symbol J2 [Conn_01x01_Pin]
+[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
+    ; warning
+    @(4.550 in, 3.000 in): Symbol R3 [R_US]
+[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
+    ; warning
+    @(4.150 in, 3.900 in): Symbol J4 [Conn_01x01_Pin]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
+    ; warning
+    @(4.150 in, 3.900 in): Symbol J4 [Conn_01x01_Pin]
+[footprint_link_issues]: Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'.
+    ; warning
+    @(4.800 in, 3.150 in): Symbol C1 [C_Small]
+[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
+    ; warning
+    @(4.800 in, 3.300 in): Symbol #PWR03 [GND]
+[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
+    ; warning
+    @(4.400 in, 3.950 in): Symbol #PWR04 [GND]
+[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
+    ; warning
+    @(4.700 in, 3.800 in): Symbol #PWR01 [GND]
 [power_pin_not_driven]: Input Power pin not driven by any Output Power pins
     ; error
     @(5.550 in, 2.800 in): Symbol U1 Pin 5 [V+, Power input, Line]
+[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
+    ; warning
+    @(5.000 in, 3.700 in): Symbol R1 [R_US]
+[footprint_link_issues]: Footprint 'SOT-23-5' not found in library 'Package_TO_SOT_SMD'.
+    ; warning
+    @(5.650 in, 3.100 in): Symbol U1 [TLV2371DBV]
+[lib_symbol_issues]: The current configuration does not include the symbol library 'Amplifier_Operational'
+    ; warning
+    @(5.650 in, 3.100 in): Symbol U1 [TLV2371DBV]
 [power_pin_not_driven]: Input Power pin not driven by any Output Power pins
     ; error
     @(5.550 in, 3.400 in): Symbol U1 Pin 2 [V-, Power input, Line]
@@ -13,53 +55,11 @@ ERC report (2025-02-22T10:28:19-0500, Encoding UTF8)
 [footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
     ; warning
     @(5.900 in, 3.700 in): Symbol R2 [R_US]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
-    ; warning
-    @(7.000 in, 3.100 in): Symbol J3 [Conn_01x01_Pin]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Amplifier_Operational'
-    ; warning
-    @(5.650 in, 3.100 in): Symbol U1 [TLV2371DBV]
-[footprint_link_issues]: Footprint 'SOT-23-5' not found in library 'Package_TO_SOT_SMD'.
-    ; warning
-    @(5.650 in, 3.100 in): Symbol U1 [TLV2371DBV]
 [footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
     ; warning
     @(7.000 in, 3.100 in): Symbol J3 [Conn_01x01_Pin]
 [lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
     ; warning
-    @(4.150 in, 3.000 in): Symbol J2 [Conn_01x01_Pin]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
-    ; warning
-    @(4.150 in, 2.500 in): Symbol J1 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
-    ; warning
-    @(4.150 in, 2.500 in): Symbol J1 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
-    ; warning
-    @(4.550 in, 3.000 in): Symbol R3 [R_US]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(4.700 in, 3.800 in): Symbol #PWR01 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(4.400 in, 3.950 in): Symbol #PWR04 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(4.800 in, 3.300 in): Symbol #PWR03 [GND]
-[footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'.
-    ; warning
-    @(5.000 in, 3.700 in): Symbol R1 [R_US]
-[footprint_link_issues]: Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'.
-    ; warning
-    @(4.800 in, 3.150 in): Symbol C1 [C_Small]
-[lib_symbol_issues]: The current configuration does not include the symbol library 'Connector'
-    ; warning
-    @(4.150 in, 3.900 in): Symbol J4 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
-    ; warning
-    @(4.150 in, 3.000 in): Symbol J2 [Conn_01x01_Pin]
-[footprint_link_issues]: Footprint 'TestPoint_Pad_3.0x3.0mm' not found in library 'TestPoint'.
-    ; warning
-    @(4.150 in, 3.900 in): Symbol J4 [Conn_01x01_Pin]
+    @(7.000 in, 3.100 in): Symbol J3 [Conn_01x01_Pin]
 
  ** ERC messages: 20  Errors 2  Warnings 18