Tag stable version 8.0.9 release.

Update translations
Translated using Weblate (Italian)
2025-02-18 11:53:59 -05:00 · 2025-02-18 19:17:06 +03:00 · 2025-02-18 16:47:58 +01:00 · 2025-02-17 18:18:25 +01:00 · 2025-02-17 08:10:50 +03:00 · 2025-02-16 18:56:02 +01:00
343 changed files with 117883 additions and 76810 deletions
@@ -4,16 +4,16 @@
 win64_build:
  stage: build
  tags:
-    - kicad-windows-1809
+    - kicad-windows-ltsc2022
  interruptible: false
-  image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/win1809-msvc:latest
+  image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/ltsc2022-msvc:latest
  variables:
    VCPKG_BINARY_SOURCES: 'nuget,kicad,readwrite'
    # Switch the compressor to fastzip and reduce the compression level
    FF_USE_FASTZIP: "true"
    CACHE_COMPRESSION_LEVEL: "fast"
  cache:
-    key: win64-vcpkg-"$CI_COMMIT_REF_SLUG"
+    key: win64-vcpkg-$CI_COMMIT_REF_SLUG
    paths:
      - build\windows\vcpkg_installed
      - .vcpkgCache
@@ -15,7 +15,7 @@ macos_build:
    - cd build/macos
    - cmake
      -G Ninja
-      -DCMAKE_TOOLCHAIN_FILE=/Users/ci/kicad-mac-builder/toolchain/kicad-mac-builder.cmake
+      -DCMAKE_TOOLCHAIN_FILE=/Users/$USER/kicad-mac-builder/toolchain/kicad-mac-builder.cmake
      ../../
    - cmake --build . 2>&1 | tee compilation_log.txt
    - cd ../../
@@ -229,7 +229,7 @@ void BOARD_ADAPTER::ReloadColorSettings() noexcept

    try
    {
-        cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>();
+        cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( "pcbnew" );
    }
    catch( const std::runtime_error& e )
    {
@@ -98,6 +98,7 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine
    TEXT_ATTRIBUTES            attrs = aText->GetAttributes();
    float                      penWidth_3DU = TO_3DU( aText->GetEffectiveTextPenWidth() );
    KIFONT::FONT*              font = aText->GetFont();
+    wxString                   shownText = aText->GetShownText( true );

    if( !font )
        font = KIFONT::FONT::GetFont( wxEmptyString, aText->IsBold(), aText->IsItalic() );
@@ -132,8 +133,15 @@ void BOARD_ADAPTER::addText( const EDA_TEXT* aText, CONTAINER_2D_BASE* aContaine

        attrs.m_Angle = aText->GetDrawRotation();

-        font->Draw( &callback_gal, aText->GetShownText( true ), aText->GetDrawPos(), attrs,
-                    aOwner->GetFontMetrics() );
+        if( auto* cache = aText->GetRenderCache( font, shownText ) )
+        {
+            callback_gal.DrawGlyphs( *cache );
+        }
+        else
+        {
+            font->Draw( &callback_gal, shownText, aText->GetDrawPos(), attrs,
+                        aOwner->GetFontMetrics() );
+        }
    }
 }

@@ -643,12 +643,33 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
            // add also this shape to the plated copper polygon list if required
            if( cfg.differentiate_plated_copper )
            {
-                if( layer == F_Cu )
-                    item->TransformShapeToPolygon( *m_frontPlatedCopperPolys, F_Cu,
-                                                    0, maxError, ERROR_INSIDE );
-                else if( layer == B_Cu )
-                    item->TransformShapeToPolygon( *m_backPlatedCopperPolys, B_Cu,
-                                                    0, maxError, ERROR_INSIDE );
+                // Note: for TEXT and TEXTBOX, TransformShapeToPolygon returns the bounding
+                // box shape, not the exact text shape. So it is not used for these items
+                if( layer == F_Cu || layer == B_Cu )
+                {
+                    SHAPE_POLY_SET* platedCopperPolys = layer == F_Cu
+                                                            ? m_frontPlatedCopperPolys
+                                                            : m_backPlatedCopperPolys;
+
+                    if( item->Type() == PCB_TEXTBOX_T )
+                    {
+                        PCB_TEXTBOX* text_box = static_cast<PCB_TEXTBOX*>( item );
+                        text_box->TransformTextToPolySet( *platedCopperPolys,
+                                                           0, maxError, ERROR_INSIDE );
+                        // Add box outlines
+                        text_box->PCB_SHAPE::TransformShapeToPolygon( *platedCopperPolys, layer,
+                                                                       0, maxError, ERROR_INSIDE );
+                    }
+                    else if( item->Type() == PCB_TEXT_T )
+                    {
+                        static_cast<PCB_TEXT*>( item )->TransformTextToPolySet(
+                                                                *platedCopperPolys,
+                                                                0, maxError, ERROR_INSIDE );
+                    }
+                    else
+                        item->TransformShapeToPolygon( *platedCopperPolys, layer,
+                                                        0, maxError, ERROR_INSIDE );
+                }
            }
        }
    }
@@ -216,6 +216,8 @@ public:
     */
    void DoRePaint();

+    void OnCloseWindow( wxCloseEvent& event );
+
 private:
    // The wxPaintEvent event. mainly calls DoRePaint()
    void OnPaint( wxPaintEvent& aEvent );
@@ -226,14 +228,13 @@ private:

    void OnMouseWheel( wxMouseEvent& event );

-    void   OnMagnify( wxMouseEvent& event );
+    void OnMagnify( wxMouseEvent& event );
    void OnMouseMove( wxMouseEvent& event );
    void OnLeftDown( wxMouseEvent& event );
    void OnLeftUp( wxMouseEvent& event );
    void OnMiddleUp( wxMouseEvent& event );
    void OnMiddleDown( wxMouseEvent& event );
    void OnTimerTimeout_Editing( wxTimerEvent& event );
-    void OnCloseWindow( wxCloseEvent& event );
    void OnResize( wxSizeEvent& event );
    void OnTimerTimeout_Redraw( wxTimerEvent& event );

@@ -38,6 +38,12 @@ COLOR_RGB::COLOR_RGB( const SFVEC3F& aColor )
 }


+COLOR_RGB::operator SFVEC3F() const
+{
+    return SFVEC3F( r / 255.0f, g / 255.0f, b / 255.0f );
+}
+
+
 COLOR_RGB BlendColor( const COLOR_RGB& aC1, const COLOR_RGB& aC2 )
 {
    const unsigned int r = aC1.r + aC2.r;
@@ -50,6 +50,8 @@ union COLOR_RGB
        g = aG;
        b = aB;
    }
+
+    operator SFVEC3F() const;
 };


@@ -429,7 +429,7 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe

            boardPolyCopy.Fracture( SHAPE_POLY_SET::PM_FAST );

-            for( int ii = 0; ii < outlineCount; ii++ )
+            for( int ii = 0; ii < boardPolyCopy.OutlineCount(); ii++ )
            {
                ConvertPolygonToBlocks( boardPolyCopy, *m_outlineBoard2dObjects,
                                        m_boardAdapter.BiuTo3dUnits(), divFactor,
@@ -1243,8 +1243,6 @@ void RENDER_3D_RAYTRACE::load3DModels( CONTAINER_3D& aDstContainer, bool aSkipMa
                    fpMatrix, SFVEC3F( modelunit_to_3d_units_factor, modelunit_to_3d_units_factor,
                                       modelunit_to_3d_units_factor ) );

-            BOARD_ITEM* boardItem = dynamic_cast<BOARD_ITEM*>( fp );
-
            // Get the list of model files for this model
            S3D_CACHE* cacheMgr = m_boardAdapter.Get3dCacheManager();
            auto       sM       = fp->Models().begin();
@@ -1304,7 +1302,7 @@ void RENDER_3D_RAYTRACE::load3DModels( CONTAINER_3D& aDstContainer, bool aSkipMa
                                SFVEC3F( sM->m_Scale.x, sM->m_Scale.y, sM->m_Scale.z ) );

                        addModels( aDstContainer, modelPtr, modelMatrix, (float) sM->m_Opacity,
-                                   aSkipMaterialInformation, boardItem );
+                                   aSkipMaterialInformation, fp );
                    }
                }

@@ -42,10 +42,15 @@ void FRUSTUM::GenerateFrustum( const RAY& topLeft, const RAY& topRight, const RA
    m_point[2] = bottomLeft.m_Origin;
    m_point[3] = topLeft.m_Origin;

-    m_normals[0] = glm::cross( topRight.m_Dir,    topLeft.m_Dir );              // TOP
-    m_normals[1] = glm::cross( bottomRight.m_Dir, topRight.m_Dir );             // RIGHT
-    m_normals[2] = glm::cross( bottomLeft.m_Dir,  bottomRight.m_Dir );          // BOTTOM
-    m_normals[3] = glm::cross( topLeft.m_Dir,     bottomLeft.m_Dir );           // LEFT
+    SFVEC3F tl_tr = topRight.m_Origin - topLeft.m_Origin;
+    SFVEC3F tr_br = bottomRight.m_Origin - topRight.m_Origin;
+    SFVEC3F br_bl = bottomLeft.m_Origin - bottomRight.m_Origin;
+    SFVEC3F bl_tl = topLeft.m_Origin - bottomLeft.m_Origin;
+
+    m_normals[0] = glm::cross( tl_tr, topLeft.m_Dir );     // TOP
+    m_normals[1] = glm::cross( tr_br, topRight.m_Dir );    // RIGHT
+    m_normals[2] = glm::cross( br_bl, bottomRight.m_Dir ); // BOTTOM
+    m_normals[3] = glm::cross( bl_tl, bottomLeft.m_Dir );  // LEFT
 }


@@ -39,6 +39,41 @@
 #include <wx/log.h>


+#ifdef USE_SRGB_SPACE
+
+/// @todo This should be removed in future when KiCad supports a greater version of glm lib.
+#define SRGB_GAMA 2.4f
+
+
+// This function implements the conversion from linear RGB to sRGB
+// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L12
+static SFVEC3F convertLinearToSRGB( const SFVEC3F& aRGBcolor )
+{
+    const float gammaCorrection = 1.0f / SRGB_GAMA;
+    const SFVEC3F clampedColor = glm::clamp( aRGBcolor, SFVEC3F( 0.0f ), SFVEC3F( 1.0f ) );
+
+    return glm::mix( glm::pow( clampedColor, SFVEC3F(gammaCorrection) ) * 1.055f - 0.055f,
+                     clampedColor * 12.92f,
+                     glm::lessThan( clampedColor, SFVEC3F(0.0031308f) ) );
+}
+
+
+// This function implements the conversion from sRGB to linear RGB
+// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L35
+SFVEC3F ConvertSRGBToLinear( const SFVEC3F& aSRGBcolor )
+{
+    const float gammaCorrection = SRGB_GAMA;
+
+    return glm::mix( glm::pow( ( aSRGBcolor + SFVEC3F( 0.055f ) )
+                               * SFVEC3F( 0.94786729857819905213270142180095f ),
+                               SFVEC3F( gammaCorrection ) ),
+                     aSRGBcolor * SFVEC3F( 0.07739938080495356037151702786378f ),
+                     glm::lessThanEqual( aSRGBcolor, SFVEC3F( 0.04045f ) ) );
+}
+
+#endif
+
+
 RENDER_3D_RAYTRACE::RENDER_3D_RAYTRACE( EDA_3D_CANVAS* aCanvas, BOARD_ADAPTER& aAdapter, CAMERA& aCamera ) :
    RENDER_3D_BASE( aCanvas, aAdapter, aCamera ),
    m_postShaderSsao( aCamera )
@@ -145,6 +180,19 @@ static inline void SetPixel( GLubyte* p, const COLOR_RGB& v )
 }


+static void SetPixelSRGB( uint8_t* p, const COLOR_RGB& v )
+{
+    SFVEC3F color = v;
+
+#ifdef USE_SRGB_SPACE
+    color = convertLinearToSRGB( color );
+#endif
+
+    COLOR_RGB rgb( color );
+    SetPixel( p, rgb );
+}
+
+
 bool RENDER_3D_RAYTRACE::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
                                 REPORTER* aWarningReporter )
 {
@@ -406,41 +454,6 @@ void RENDER_3D_RAYTRACE::renderTracing( GLubyte* ptrPBO, REPORTER* aStatusReport
 }


-#ifdef USE_SRGB_SPACE
-
-/// @todo This should be removed in future when KiCad supports a greater version of glm lib.
-#define SRGB_GAMA 2.4f
-
-
-// This function implements the conversion from linear RGB to sRGB
-// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L12
-static SFVEC3F convertLinearToSRGB( const SFVEC3F& aRGBcolor )
-{
-    const float gammaCorrection = 1.0f / SRGB_GAMA;
-    const SFVEC3F clampedColor = glm::clamp( aRGBcolor, SFVEC3F( 0.0f ), SFVEC3F( 1.0f ) );
-
-    return glm::mix( glm::pow( clampedColor, SFVEC3F(gammaCorrection) ) * 1.055f - 0.055f,
-                     clampedColor * 12.92f,
-                     glm::lessThan( clampedColor, SFVEC3F(0.0031308f) ) );
-}
-
-
-// This function implements the conversion from sRGB to linear RGB
-// https://github.com/g-truc/glm/blob/master/glm/gtc/color_space.inl#L35
-SFVEC3F ConvertSRGBToLinear( const SFVEC3F& aSRGBcolor )
-{
-    const float gammaCorrection = SRGB_GAMA;
-
-    return glm::mix( glm::pow( ( aSRGBcolor + SFVEC3F( 0.055f ) )
-                               * SFVEC3F( 0.94786729857819905213270142180095f ),
-                               SFVEC3F( gammaCorrection ) ),
-                     aSRGBcolor * SFVEC3F( 0.07739938080495356037151702786378f ),
-                     glm::lessThanEqual( aSRGBcolor, SFVEC3F( 0.04045f ) ) );
-}
-
-#endif
-
-
 void RENDER_3D_RAYTRACE::renderFinalColor( GLubyte* ptrPBO, const SFVEC3F& rgbColor,
                                         bool applyColorSpaceConversion )
 {
@@ -946,6 +959,9 @@ void RENDER_3D_RAYTRACE::renderPreview( GLubyte* ptrPBO )
 {
    m_isPreview = true;

+    m_backgroundColorTop = ConvertSRGBToLinear( m_boardAdapter.m_BgColorTop );
+    m_backgroundColorBottom = ConvertSRGBToLinear( m_boardAdapter.m_BgColorBot );
+
    std::atomic<size_t> nextBlock( 0 );
    std::atomic<size_t> threadsFinished( 0 );

@@ -982,13 +998,16 @@ void RENDER_3D_RAYTRACE::renderPreview( GLubyte* ptrPBO )
                // Calculate background gradient color
                SFVEC3F bgColor[RAYPACKET_DIM];

+                SFVEC3F bgTopColor = m_backgroundColorTop;
+                SFVEC3F bgBotColor = m_backgroundColorBottom;
+
                for( unsigned int y = 0; y < RAYPACKET_DIM; ++y )
                {
                    const float posYfactor =
                            (float) ( windowsPos.y + y * 4.0f ) / (float) m_windowSize.y;

-                    bgColor[y] = (SFVEC3F) m_boardAdapter.m_BgColorTop * SFVEC3F( posYfactor )
-                                 + (SFVEC3F) m_boardAdapter.m_BgColorBot
+                    bgColor[y] = (SFVEC3F) bgTopColor * SFVEC3F( posYfactor )
+                                 + (SFVEC3F) bgBotColor
                                           * ( SFVEC3F( 1.0f ) - SFVEC3F( posYfactor ) );
                }

@@ -1499,28 +1518,29 @@ void RENDER_3D_RAYTRACE::renderPreview( GLubyte* ptrPBO )
                                &ptrPBO[( 4 * x + m_blockPositionsFast[iBlock].x
                                          + m_realBufferSize.x
                                          * ( m_blockPositionsFast[iBlock].y + 4 * y ) ) * 4];
-                        SetPixel( ptr + 0, cLT );
-                        SetPixel( ptr +  4, BlendColor( cLT, cLRT, cLTC ) );
-                        SetPixel( ptr +  8, cLRT );
-                        SetPixel( ptr + 12, BlendColor( cLRT, cRT, cRTC ) );
+
+                        SetPixelSRGB( ptr +  0, cLT );
+                        SetPixelSRGB( ptr +  4, BlendColor( cLT, cLRT, cLTC ) );
+                        SetPixelSRGB( ptr +  8, cLRT );
+                        SetPixelSRGB( ptr + 12, BlendColor( cLRT, cRT, cRTC ) );

                        ptr += m_realBufferSize.x * 4;
-                        SetPixel( ptr +  0, BlendColor( cLT , cLTB, cLTC ) );
-                        SetPixel( ptr +  4, BlendColor( cLTC, BlendColor( cLT , cC ) ) );
-                        SetPixel( ptr +  8, BlendColor( cC, BlendColor( cLRT, cLTC, cRTC ) ) );
-                        SetPixel( ptr + 12, BlendColor( cRTC, BlendColor( cRT , cC ) ) );
+                        SetPixelSRGB( ptr +  0, BlendColor( cLT , cLTB, cLTC ) );
+                        SetPixelSRGB( ptr +  4, BlendColor( cLTC, BlendColor( cLT , cC ) ) );
+                        SetPixelSRGB( ptr +  8, BlendColor( cC, BlendColor( cLRT, cLTC, cRTC ) ) );
+                        SetPixelSRGB( ptr + 12, BlendColor( cRTC, BlendColor( cRT , cC ) ) );

                        ptr += m_realBufferSize.x * 4;
-                        SetPixel( ptr +  0, cLTB );
-                        SetPixel( ptr +  4, BlendColor( cC, BlendColor( cLTB, cLTC, cLBC ) ) );
-                        SetPixel( ptr +  8, cC );
-                        SetPixel( ptr + 12, BlendColor( cC, BlendColor( cRTB, cRTC, cRBC ) ) );
+                        SetPixelSRGB( ptr +  0, cLTB );
+                        SetPixelSRGB( ptr +  4, BlendColor( cC, BlendColor( cLTB, cLTC, cLBC ) ) );
+                        SetPixelSRGB( ptr +  8, cC );
+                        SetPixelSRGB( ptr + 12, BlendColor( cC, BlendColor( cRTB, cRTC, cRBC ) ) );

                        ptr += m_realBufferSize.x * 4;
-                        SetPixel( ptr +  0, BlendColor( cLB , cLTB, cLBC ) );
-                        SetPixel( ptr +  4, BlendColor( cLBC, BlendColor( cLB , cC ) ) );
-                        SetPixel( ptr +  8, BlendColor( cC, BlendColor( cLRB, cLBC, cRBC ) ) );
-                        SetPixel( ptr + 12, BlendColor( cRBC, BlendColor( cRB , cC ) ) );
+                        SetPixelSRGB( ptr +  0, BlendColor( cLB , cLTB, cLBC ) );
+                        SetPixelSRGB( ptr +  4, BlendColor( cLBC, BlendColor( cLB , cC ) ) );
+                        SetPixelSRGB( ptr +  8, BlendColor( cC, BlendColor( cLRB, cLBC, cRBC ) ) );
+                        SetPixelSRGB( ptr + 12, BlendColor( cRBC, BlendColor( cRB , cC ) ) );
                    }
                }
            }
@@ -1572,9 +1592,6 @@ SFVEC3F RENDER_3D_RAYTRACE::shadeHit( const SFVEC3F& aBgColor, const RAY& aRay,

        light->GetLightParameters( hitPoint, vectorToLight, colorOfLight, distToLight );

-        if( m_isPreview )
-            colorOfLight = SFVEC3F( 1.0f );
-
        const float NdotL = glm::dot( aHitInfo.m_HitNormal, vectorToLight );

        // Only calc shade if the normal is facing the direction of light,
@@ -1641,10 +1658,6 @@ SFVEC3F RENDER_3D_RAYTRACE::shadeHit( const SFVEC3F& aBgColor, const RAY& aRay,
            outColor += objMaterial->Shade( aRay, aHitInfo, NdotL, diffuseColorObj, vectorToLight,
                                            colorOfLight, shadow_att_factor_light );
        }
-
-        // Only use the headlight for preview
-        if( m_isPreview )
-            break;
    }

    // Improvement: this is not taking in account the lightcolor
@@ -113,7 +113,7 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent
    SetStatusWidths( arrayDim( status_dims ), status_dims );

    SETTINGS_MANAGER&       mgr = Pgm().GetSettingsManager();
-    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
    ANTIALIASING_MODE       aaMode = static_cast<ANTIALIASING_MODE>( cfg->m_Render.opengl_AA_mode );

    m_canvas = new EDA_3D_CANVAS( this, OGL_ATT_LIST::GetAttributesList( aaMode ), m_boardAdapter,
@@ -479,7 +479,7 @@ void EDA_3D_VIEWER_FRAME::Process_Special_Functions( wxCommandEvent &event )

    case ID_MENU3D_RESET_DEFAULTS:
    {
-        auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+        auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
        cfg->ResetToDefaults();
        LoadSettings( cfg );

@@ -561,8 +561,8 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg )
 {
    EDA_BASE_FRAME::LoadSettings( aCfg );

-    EDA_3D_VIEWER_SETTINGS* cfg = dynamic_cast<EDA_3D_VIEWER_SETTINGS*>( aCfg );
-    wxASSERT( cfg );
+    // Dynamic_cast here will fail on Mac when called from CvPCB.
+    EDA_3D_VIEWER_SETTINGS* cfg = static_cast<EDA_3D_VIEWER_SETTINGS*>( aCfg );

    wxLogTrace( m_logTrace, wxT( "EDA_3D_VIEWER_FRAME::LoadSettings" ) );

@@ -606,7 +606,7 @@ void EDA_3D_VIEWER_FRAME::LoadSettings( APP_SETTINGS_BASE *aCfg )

 void EDA_3D_VIEWER_FRAME::SaveSettings( APP_SETTINGS_BASE *aCfg )
 {
-    auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    auto cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );

    EDA_BASE_FRAME::SaveSettings( cfg );

@@ -642,7 +642,7 @@ void EDA_3D_VIEWER_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTex
    ReCreateMainToolbar();

    loadCommonSettings();
-    applySettings( Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>() );
+    applySettings( Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" ) );

    m_appearancePanel->CommonSettingsChanged();

@@ -673,7 +673,7 @@ void EDA_3D_VIEWER_FRAME::ShowChangedLanguage()
 void EDA_3D_VIEWER_FRAME::ToggleAppearanceManager()
 {
    SETTINGS_MANAGER&       mgr = Pgm().GetSettingsManager();
-    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    EDA_3D_VIEWER_SETTINGS* cfg = mgr.GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );
    wxAuiPaneInfo&          layersManager = m_auimgr.GetPane( "LayersManager" );

    // show auxiliary Vertical layers and visibility manager toolbar
@@ -221,7 +221,7 @@ void PANEL_PREVIEW_3D_MODEL::loadSettings()
    // TODO(JE) use all control options
    m_boardAdapter.m_MousewheelPanning = settings->m_Input.scroll_modifier_zoom != 0;

-    EDA_3D_VIEWER_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>();
+    auto* cfg = Pgm().GetSettingsManager().GetAppSettings<EDA_3D_VIEWER_SETTINGS>( "3d_viewer" );

    if( cfg )
    {
@@ -573,6 +573,9 @@ if( MSVC )
    if( KICAD_WIN32_BUILD_PARALLEL_CL_MP )
        string( APPEND CMAKE_CXX_FLAGS " /MP" )
    endif()
+
+    set( CMAKE_INSTALL_UCRT_LIBRARIES TRUE )
+    include( InstallRequiredSystemLibraries )
 endif()

 # KIFACE_SUFFIX is the file extension used for top level program modules which
@@ -37,7 +37,7 @@
 # KiCad.
 #
 # Note: This version string should follow the semantic versioning system
-set( KICAD_SEMANTIC_VERSION "8.0.7" )
+set( KICAD_SEMANTIC_VERSION "8.0.9" )

 # Default the version to the semantic version.
 # This is overridden by the git repository tag though (if using git)
@@ -110,9 +110,9 @@ static const wxChar TriangulateSimplificationLevel[] = wxT( "TriangulateSimplifi
 static const wxChar TriangulateMinimumArea[] = wxT( "TriangulateMinimumArea" );
 static const wxChar EnableCacheFriendlyFracture[] = wxT( "EnableCacheFriendlyFracture" );
 static const wxChar MinParallelAngle[] = wxT( "MinParallelAngle" );
+static const wxChar ResolveTextRecursionDepth[] = wxT( "ResolveTextRecursionDepth" );
 } // namespace KEYS

-
 /**
 * List of known groups for advanced configuration options.
 *
@@ -264,6 +264,8 @@ ADVANCED_CFG::ADVANCED_CFG()

    m_MinParallelAngle = 0.001;

+    m_ResolveTextRecursionDepth = 3;
+
    loadFromConfigFile();
 }

@@ -484,6 +486,10 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
                                                  &m_MinParallelAngle, m_MinParallelAngle,
                                                  0.0, 45.0 ) );

+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::ResolveTextRecursionDepth,
+                                                  &m_ResolveTextRecursionDepth,
+                                                  m_ResolveTextRecursionDepth, 0, 10 ) );
+
    // Special case for trace mask setting...we just grab them and set them immediately
    // Because we even use wxLogTrace inside of advanced config
    wxString traceMasks;
@@ -182,7 +182,7 @@ BACKGROUND_JOB_REPORTER::BACKGROUND_JOB_REPORTER( BACKGROUND_JOBS_MONITOR* aMoni

 bool BACKGROUND_JOB_REPORTER::updateUI()
 {
-    return true;
+    return !m_cancelled;
 }


@@ -265,7 +265,11 @@ void BACKGROUND_JOBS_MONITOR::Remove( std::shared_ptr<BACKGROUND_JOB> aJob )
                                      return job == aJob;
                               } ) );

-    if( m_jobs.size() == 0 )
+    if( m_jobs.size() > 0 )
+    {
+        jobUpdated( m_jobs.front() );
+    }
+    else
    {
        for( KISTATUSBAR* statusBar : m_statusBars )
        {
@@ -18,6 +18,7 @@
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <boost/algorithm/string.hpp>
 #include <boost/locale.hpp>
 #include <fmt/core.h>
 #include <nanodbc/nanodbc.h>
@@ -236,7 +237,7 @@ bool DATABASE_CONNECTION::CacheTableInfo( const std::string& aTable,
            {
                std::string columnKey = toUTF8( columns.column_name() );

-                if( aColumns.count( columnKey ) )
+                if( aColumns.count( boost::to_lower_copy( columnKey ) ) )
                    m_columnCache[key][columnKey] = columns.data_type();
            }

@@ -627,7 +628,13 @@ bool DATABASE_CONNECTION::selectAllAndCache( const std::string& aTable, const st
            }
        }

-        wxASSERT( result.count( aKey ) );
+        if( !result.count( aKey ) )
+        {
+            wxLogTrace( traceDatabase,
+                  wxT( "selectAllAndCache: warning: key %s not found in result set" ), aKey );
+            continue;
+        }
+
        std::string keyStr = std::any_cast<std::string>( result.at( aKey ) );
        cacheEntry[keyStr] = result;
    }
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
 * Copyright (C) 2023 CERN
- * Copyright (C) 2012-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2012-2023, 2024 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -465,6 +465,19 @@ void DIALOG_SHIM::OnModify()
 }


+int DIALOG_SHIM::ShowModal()
+{
+    // Apple in its infinite wisdom will raise a disabled window before even passing
+    // us the event, so we have no way to stop it.  Instead, we must set an order on
+    // the windows so that the modal will be pushed in front of the disabled
+    // window when it is raised.
+    KIPLATFORM::UI::ReparentModal( this );
+
+    // Call the base class ShowModal() method
+    return wxDialog::ShowModal();
+}
+
+
 /*
    Quasi-Modal Mode Explained:

@@ -520,7 +533,7 @@ int DIALOG_SHIM::ShowQuasiModal()
    // us the event, so we have no way to stop it.  Instead, we must set an order on
    // the windows so that the quasi-modal will be pushed in front of the disabled
    // window when it is raised.
-    KIPLATFORM::UI::ReparentQuasiModal( this );
+    KIPLATFORM::UI::ReparentModal( this );

    Show( true );

@@ -557,6 +570,8 @@ void DIALOG_SHIM::EndQuasiModal( int retCode )
        return;
    }

+    TearDownQuasiModal();
+
    if( m_qmodal_loop )
    {
        if( m_qmodal_loop->IsRunning() )
@@ -2,7 +2,7 @@
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
 * Copyright (C) 2020 Jon Evans <jon@craftyjon.com>
- * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020-2022, 2024 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software: you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -39,7 +39,8 @@ DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) :

    SetupStandardButtons();

-    GetSizer()->SetSizeHints( this );
+    Layout();
+    m_sizer->Fit( this );
    Centre();
 }

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <wxFormBuilder_Project>
-  <FileVersion major="1" minor="17"/>
+  <FileVersion major="1" minor="18"/>
  <object class="Project" expanded="true">
-    <property name="class_decoration">; </property>
    <property name="code_generation">C++</property>
-    <property name="disconnect_events">1</property>
-    <property name="disconnect_mode">source_name</property>
-    <property name="disconnect_php_events">0</property>
-    <property name="disconnect_python_events">0</property>
+    <property name="cpp_class_decoration">; </property>
+    <property name="cpp_disconnect_events">1</property>
+    <property name="cpp_event_generation">connect</property>
+    <property name="cpp_help_provider">none</property>
+    <property name="cpp_namespace"></property>
+    <property name="cpp_precompiled_header"></property>
+    <property name="cpp_use_array_enum">0</property>
+    <property name="cpp_use_enum">0</property>
    <property name="embedded_files_path">res</property>
    <property name="encoding">UTF-8</property>
-    <property name="event_generation">connect</property>
    <property name="file">dialog_migrate_settings_base</property>
    <property name="first_id">1000</property>
-    <property name="help_provider">none</property>
-    <property name="image_path_wrapper_function_name"></property>
-    <property name="indent_with_spaces"></property>
    <property name="internationalize">1</property>
+    <property name="lua_skip_events">1</property>
+    <property name="lua_ui_table">UI</property>
    <property name="name">DIALOG_MIGRATE_SETTINGS</property>
-    <property name="namespace"></property>
    <property name="path">.</property>
-    <property name="precompiled_header"></property>
+    <property name="php_disconnect_events">0</property>
+    <property name="php_disconnect_mode">source_name</property>
+    <property name="php_skip_events">1</property>
+    <property name="python_disconnect_events">0</property>
+    <property name="python_disconnect_mode">source_name</property>
+    <property name="python_image_path_wrapper_function_name"></property>
+    <property name="python_indent_with_spaces"></property>
+    <property name="python_skip_events">1</property>
    <property name="relative_path">1</property>
-    <property name="skip_lua_events">1</property>
-    <property name="skip_php_events">1</property>
-    <property name="skip_python_events">1</property>
-    <property name="ui_table">UI</property>
-    <property name="use_array_enum">0</property>
-    <property name="use_enum">0</property>
    <property name="use_microsoft_bom">0</property>
+    <property name="use_native_eol">0</property>
    <object class="Dialog" expanded="true">
      <property name="aui_managed">0</property>
      <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@@ -49,7 +51,7 @@
      <property name="name">DIALOG_MIGRATE_SETTINGS_BASE</property>
      <property name="pos"></property>
      <property name="size"></property>
-      <property name="style">wxCAPTION</property>
+      <property name="style">wxCAPTION|wxRESIZE_BORDER</property>
      <property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property>
      <property name="title">Configure KiCad Settings Path</property>
      <property name="tooltip"></property>
@@ -80,10 +82,10 @@
                <property name="LeftDockable">1</property>
                <property name="RightDockable">1</property>
                <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                <property name="best_size"></property>
                <property name="bg"></property>
                <property name="caption"></property>
@@ -152,10 +154,10 @@
                <property name="LeftDockable">1</property>
                <property name="RightDockable">1</property>
                <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                <property name="best_size"></property>
                <property name="bg"></property>
                <property name="caption"></property>
@@ -214,10 +216,10 @@
                <property name="LeftDockable">1</property>
                <property name="RightDockable">1</property>
                <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                <property name="best_size"></property>
                <property name="bg"></property>
                <property name="caption"></property>
@@ -299,10 +301,10 @@
                    <property name="LeftDockable">1</property>
                    <property name="RightDockable">1</property>
                    <property name="TopDockable">1</property>
-                    <property name="aui_layer"></property>
+                    <property name="aui_layer">0</property>
                    <property name="aui_name"></property>
-                    <property name="aui_position"></property>
-                    <property name="aui_row"></property>
+                    <property name="aui_position">0</property>
+                    <property name="aui_row">0</property>
                    <property name="best_size"></property>
                    <property name="bg"></property>
                    <property name="caption"></property>
@@ -368,10 +370,10 @@
                    <property name="LeftDockable">1</property>
                    <property name="RightDockable">1</property>
                    <property name="TopDockable">1</property>
-                    <property name="aui_layer"></property>
+                    <property name="aui_layer">0</property>
                    <property name="aui_name"></property>
-                    <property name="aui_position"></property>
-                    <property name="aui_row"></property>
+                    <property name="aui_position">0</property>
+                    <property name="aui_row">0</property>
                    <property name="auth_needed">0</property>
                    <property name="best_size"></property>
                    <property name="bg"></property>
@@ -445,10 +447,10 @@
                <property name="LeftDockable">1</property>
                <property name="RightDockable">1</property>
                <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                <property name="best_size"></property>
                <property name="bg"></property>
                <property name="caption"></property>
@@ -507,10 +509,10 @@
                <property name="LeftDockable">1</property>
                <property name="RightDockable">1</property>
                <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                <property name="best_size"></property>
                <property name="bg"></property>
                <property name="caption"></property>
@@ -572,10 +574,10 @@
                <property name="LeftDockable">1</property>
                <property name="RightDockable">1</property>
                <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
+                <property name="aui_position">0</property>
+                <property name="aui_row">0</property>
                <property name="best_size"></property>
                <property name="bg"></property>
                <property name="caption"></property>
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -32,7 +32,6 @@ class STD_BITMAP_BUTTON;

 ///////////////////////////////////////////////////////////////////////////

-
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DIALOG_MIGRATE_SETTINGS_BASE
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,7 +63,7 @@ class DIALOG_MIGRATE_SETTINGS_BASE : public DIALOG_SHIM

 	public:

-		DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure KiCad Settings Path"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAPTION );
+		DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure KiCad Settings Path"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCAPTION|wxRESIZE_BORDER );

 		~DIALOG_MIGRATE_SETTINGS_BASE();

@@ -57,6 +57,10 @@ WX_PT_ENTRY_DIALOG::WX_PT_ENTRY_DIALOG( EDA_DRAW_FRAME* aParent, const wxString&
 {
    m_labelX->SetLabel( aLabelX );
    m_labelY->SetLabel( aLabelY );
+
+    m_unit_binder_x.SetCoordType( ORIGIN_TRANSFORMS::ABS_X_COORD );
+    m_unit_binder_y.SetCoordType( ORIGIN_TRANSFORMS::ABS_Y_COORD );
+
    m_unit_binder_x.SetValue( aDefaultValue.x );
    m_unit_binder_y.SetValue( aDefaultValue.y );

@@ -191,20 +191,16 @@ void PANEL_COLOR_SETTINGS::OnThemeChanged( wxCommandEvent& event )
 void PANEL_COLOR_SETTINGS::updateSwatches()
 {
    if( m_swatches.empty() )
-    {
        createSwatches();
-    }
-    else
-    {
-        bool    isReadOnly = m_currentSettings->IsReadOnly();
-        COLOR4D background = m_currentSettings->GetColor( m_backgroundLayer );

-        for( std::pair<int, COLOR_SWATCH*> pair : m_swatches )
-        {
-            pair.second->SetSwatchBackground( background );
-            pair.second->SetSwatchColor( m_currentSettings->GetColor( pair.first ), false );
-            pair.second->SetReadOnly( isReadOnly );
-        }
+    bool    isReadOnly = m_currentSettings->IsReadOnly();
+    COLOR4D background = m_currentSettings->GetColor( m_backgroundLayer );
+
+    for( std::pair<int, COLOR_SWATCH*> pair : m_swatches )
+    {
+        pair.second->SetSwatchBackground( background );
+        pair.second->SetSwatchColor( m_currentSettings->GetColor( pair.first ), false );
+        pair.second->SetReadOnly( isReadOnly );
    }
 }

@@ -114,7 +114,6 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
    m_drawBgColor         = COLOR4D( BLACK );   // the background color of the draw canvas:
                                                // BLACK for Pcbnew, BLACK or WHITE for Eeschema
    m_colorSettings       = nullptr;
-    m_msgFrameHeight      = EDA_MSG_PANEL::GetRequiredHeight( this );
    m_polarCoords         = false;
    m_findReplaceData     = std::make_unique<EDA_SEARCH_DATA>();
    m_hotkeyPopup         = nullptr;
@@ -170,15 +169,16 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
        stsbar->SetFont( KIUI::GetStatusFont( this ) );
    }

+    m_messagePanel = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_frameSize.y ), wxDefaultSize );
+    m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
+    m_msgFrameHeight = m_messagePanel->GetBestSize().y;
+
    // Create child subwindows.
    GetClientSize( &m_frameSize.x, &m_frameSize.y );
    m_framePos.x   = m_framePos.y = 0;
    m_frameSize.y -= m_msgFrameHeight;

-    m_messagePanel  = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_frameSize.y ),
-                                         wxSize( m_frameSize.x, m_msgFrameHeight ) );
-
-    m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
+    m_messagePanel->SetSize( m_frameSize.x, m_msgFrameHeight );

    Bind( wxEVT_DPI_CHANGED,
          [&]( wxDPIChangedEvent& )
@@ -190,11 +190,13 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
              // especially important even for first launches as the constructor of the window
              // here usually doesn't have the correct dpi awareness yet
              m_frameSize.y += m_msgFrameHeight;
-              m_msgFrameHeight = EDA_MSG_PANEL::GetRequiredHeight( this );
+              m_msgFrameHeight = m_messagePanel->GetBestSize().y;
              m_frameSize.y -= m_msgFrameHeight;

              m_messagePanel->SetPosition( wxPoint( 0, m_frameSize.y ) );
              m_messagePanel->SetSize( m_frameSize.x, m_msgFrameHeight );
+
+              // Don't skip, otherwise the frame gets too big
          } );
 }

@@ -34,7 +34,8 @@
 #include <wx/fdrepdlg.h>
 #include <eda_pattern_match.h>

-EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType ) :
+EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType, bool isSCH_ITEM, bool isBOARD_ITEM ) :
+        KIGFX::VIEW_ITEM( isSCH_ITEM, isBOARD_ITEM ),
        m_parent( parent ),
        m_forceVisible( false ),
        m_flags( 0 ),
@@ -42,7 +43,8 @@ EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType ) :
 { }


-EDA_ITEM::EDA_ITEM( KICAD_T idType ) :
+EDA_ITEM::EDA_ITEM( KICAD_T idType, bool isSCH_ITEM, bool isBOARD_ITEM ) :
+        KIGFX::VIEW_ITEM( isSCH_ITEM, isBOARD_ITEM ),
        m_parent( nullptr ),
        m_forceVisible( false ),
        m_flags( 0 ),
@@ -51,6 +53,7 @@ EDA_ITEM::EDA_ITEM( KICAD_T idType ) :


 EDA_ITEM::EDA_ITEM( const EDA_ITEM& base ) :
+        KIGFX::VIEW_ITEM( base.IsSCH_ITEM(), base.IsBOARD_ITEM() ),
        m_Uuid( base.m_Uuid ),
        m_parent( base.m_parent ),
        m_forceVisible( base.m_forceVisible ),
@@ -476,6 +476,12 @@ int EDA_COMBINED_MATCHER::ScoreTerms( std::vector<SEARCH_TERM>& aWeightedTerms )
        if( !term.Normalized )
        {
            term.Text = term.Text.MakeLower().Trim( false ).Trim( true );
+
+            // Don't cause KiCad to hang if someone accidentally pastes the PCB or schematic
+            // into the search box.
+            if( term.Text.Length() > 1000 )
+                term.Text = term.Text.Left( 1000 );
+
            term.Normalized = true;
        }

@@ -182,6 +182,32 @@ void EDA_SHAPE::SetLength( const double& aLength )
    }
 }

+void EDA_SHAPE::SetRectangleHeight( const int& aHeight )
+{
+    switch ( m_shape )
+    {
+    case SHAPE_T::RECTANGLE:
+        m_rectangleHeight = aHeight;
+        SetEndY( GetStartY() + m_rectangleHeight );
+        break;
+
+    default: UNIMPLEMENTED_FOR( SHAPE_T_asString() );
+    }
+}
+
+void EDA_SHAPE::SetRectangleWidth( const int& aWidth )
+{
+    switch ( m_shape )
+    {
+    case SHAPE_T::RECTANGLE:
+        m_rectangleWidth = aWidth;
+        SetEndX( GetStartX() + m_rectangleWidth );
+        break;
+
+    default: UNIMPLEMENTED_FOR( SHAPE_T_asString() );
+    }
+}
+
 void EDA_SHAPE::SetRectangle( const long long int& aHeight, const long long int& aWidth )
 {
    switch ( m_shape )
@@ -243,12 +269,18 @@ void EDA_SHAPE::move( const VECTOR2I& aMoveVector )
    switch ( m_shape )
    {
    case SHAPE_T::ARC:
+        m_arcCenter += aMoveVector;
+        m_arcMidData.center += aMoveVector;
+        m_arcMidData.start += aMoveVector;
+        m_arcMidData.end += aMoveVector;
+        m_arcMidData.mid += aMoveVector;
+        KI_FALLTHROUGH;
+
    case SHAPE_T::SEGMENT:
    case SHAPE_T::RECTANGLE:
    case SHAPE_T::CIRCLE:
        m_start += aMoveVector;
        m_end += aMoveVector;
-        m_arcCenter += aMoveVector;
        break;

    case SHAPE_T::POLY:
@@ -342,6 +374,10 @@ void EDA_SHAPE::rotate( const VECTOR2I& aRotCentre, const EDA_ANGLE& aAngle )
        RotatePoint( m_start, aRotCentre, aAngle );
        RotatePoint( m_end, aRotCentre, aAngle );
        RotatePoint( m_arcCenter, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.start, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.end, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.mid, aRotCentre, aAngle );
+        RotatePoint( m_arcMidData.center, aRotCentre, aAngle );
        break;

    case SHAPE_T::RECTANGLE:
@@ -1971,6 +2007,15 @@ static struct EDA_SHAPE_DESC
            return false;
        };

+        auto isRectangle = []( INSPECTABLE* aItem ) -> bool
+        {
+            // Polygons, unlike other shapes, have no meaningful start or end coordinates
+            if( EDA_SHAPE* shape = dynamic_cast<EDA_SHAPE*>( aItem ) )
+                return shape->GetShape() == SHAPE_T::RECTANGLE;
+
+            return false;
+        };
+
        const wxString shapeProps = _HKI( "Shape Properties" );

        auto shape = new PROPERTY_ENUM<EDA_SHAPE, SHAPE_T>( _HKI( "Shape" ),
@@ -2018,6 +2063,18 @@ static struct EDA_SHAPE_DESC
                    shapeProps )
                .SetAvailableFunc( isNotPolygonOrCircle );

+        propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Width" ),
+                    &EDA_SHAPE::SetRectangleWidth, &EDA_SHAPE::GetRectangleWidth, PROPERTY_DISPLAY::PT_COORD,
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ),
+                    shapeProps )
+                .SetAvailableFunc( isRectangle );
+
+        propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Height" ),
+                    &EDA_SHAPE::SetRectangleHeight, &EDA_SHAPE::GetRectangleHeight, PROPERTY_DISPLAY::PT_COORD,
+                    ORIGIN_TRANSFORMS::ABS_Y_COORD ),
+                    shapeProps )
+                .SetAvailableFunc( isRectangle );
+
        propMgr.AddProperty( new PROPERTY<EDA_SHAPE, int>( _HKI( "Line Width" ),
                    &EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::PT_SIZE ),
                    shapeProps );
@@ -267,6 +267,7 @@ struct GLYPH_CACHE_KEY {
    bool           fakeItalic;
    bool           fakeBold;
    bool           mirror;
+    bool           supersub;
    EDA_ANGLE      angle;

    bool operator==(const GLYPH_CACHE_KEY& rhs ) const
@@ -278,6 +279,7 @@ struct GLYPH_CACHE_KEY {
                && fakeItalic == rhs.fakeItalic
                && fakeBold == rhs.fakeBold
                && mirror == rhs.mirror
+                && supersub == rhs.supersub
                && angle == rhs.angle;
    }
 };
@@ -296,6 +298,7 @@ namespace std
                        ^ hash<int>()( k.fakeItalic )
                        ^ hash<int>()( k.fakeBold )
                        ^ hash<int>()( k.mirror )
+                        ^ hash<int>()( k.supersub )
                        ^ hash<int>()( k.angle.AsTenthsOfADegree() );
        }
    };
@@ -312,11 +315,10 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
    VECTOR2D glyphSize = aSize;
    FT_Face  face = m_face;
    double   scaler = faceSize();
+    bool     supersub = IsSuperscript( aTextStyle ) || IsSubscript( aTextStyle );

-    if( IsSubscript( aTextStyle ) || IsSuperscript( aTextStyle ) )
-    {
+    if( supersub )
        scaler = subscriptSize();
-    }

    // set glyph resolution so that FT_Load_Glyph() results are good enough for decomposing
    FT_Set_Char_Size( face, 0, scaler, GLYPH_RESOLUTION, 0 );
@@ -355,7 +357,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
        if( aGlyphs )
        {
            GLYPH_CACHE_KEY key = { face, glyphInfo[i].codepoint, scaler, m_forDrawingSheet,
-                                    m_fakeItal, m_fakeBold, aMirror, aAngle };
+                                    m_fakeItal, m_fakeBold, aMirror, supersub, aAngle };
            GLYPH_DATA&     glyphData = s_glyphCache[ key ];

            if( glyphData.m_Contours.empty() )
@@ -275,25 +275,6 @@ bool OpenPDF( const wxString& file )
 }


-void OpenFile( const wxString& file )
-{
-    wxFileName  fileName( file );
-    wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( fileName.GetExt() );
-
-    if( !filetype )
-        return;
-
-    wxString    command;
-    wxFileType::MessageParameters params( file );
-
-    filetype->GetOpenCommand( &command, params );
-    delete filetype;
-
-    if( !command.IsEmpty() )
-        wxExecute( command );
-}
-
-
 void KiCopyFile( const wxString& aSrcPath, const wxString& aDestPath, wxString& aErrors )
 {
    if( !wxCopyFile( aSrcPath, aDestPath ) )
@@ -143,8 +143,15 @@ bool HTTP_LIB_CONNECTION::syncCategories()
        {
            HTTP_LIB_CATEGORY category;

-            category.id = item.value()["id"].get<std::string>();
-            category.name = item.value()["name"].get<std::string>();
+            auto& value = item.value();
+            category.id = value["id"].get<std::string>();
+            category.name = value["name"].get<std::string>();
+
+            if( value.contains( "description" ) )
+            {
+                category.description = value["description"].get<std::string>();
+                m_categoryDescriptions[category.name] = category.description;
+            }

            m_categories.push_back( category );
        }
@@ -179,12 +186,12 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
    if( m_cachedParts.find( aPartID ) != m_cachedParts.end() )
    {
        // check if it's outdated, if so re-fetch
-        if( std::difftime( std::time( nullptr ), m_cachedParts[aPartID].lastCached ) < m_source.timeout_parts )
+        if( std::difftime( std::time( nullptr ), m_cachedParts[aPartID].lastCached )
+            < m_source.timeout_parts )
        {
            aFetchedPart = m_cachedParts[aPartID];
            return true;
        }
-
    }

    std::string res = "";
@@ -203,7 +210,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
            return false;
        }

-        nlohmann::json response = nlohmann::json::parse( res );
+        nlohmann::ordered_json response = nlohmann::ordered_json::parse( res );
        std::string    key = "";
        std::string    value = "";

@@ -252,6 +259,9 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
            aFetchedPart.exclude_from_sim = boolFromString( exclude, false );
        }

+        // remove previously loaded fields
+        aFetchedPart.fields.clear();
+
        // Extract available fields
        for( const auto& field : response.at( "fields" ).items() )
        {
@@ -273,10 +283,8 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
            }

            // Add field to fields list
-            if( key.length() )
-            {
-                aFetchedPart.fields[key] = std::make_tuple( value, visible );
-            }
+            aFetchedPart.fields.push_back(
+                    std::make_pair( key, std::make_tuple( value, visible ) ) );
        }
    }
    catch( const std::exception& e )
@@ -297,7 +305,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
 }


-bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY& aCategory,
+bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY&    aCategory,
                                     std::vector<HTTP_LIB_PART>& aParts )
 {
    if( !IsValidEndpoint() )
@@ -319,8 +327,6 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY& aCategory,
        res = curl->GetBuffer();

        nlohmann::json response = nlohmann::json::parse( res );
-        std::string    key = "";
-        std::string    value = "";

        for( nlohmann::json& item : response )
        {
@@ -332,7 +338,8 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY& aCategory,
            if( item.contains( "description" ) )
            {
                // At this point we don't display anything so just set it to false
-                part.fields["description"] = std::make_tuple( item.at( "description" ), false );
+                part.fields.push_back( std::make_pair(
+                        "description", std::make_tuple( item.at( "description" ), false ) ) );
            }

            // API might not want to return an optional name.
@@ -128,16 +128,19 @@ void GRAPHICS_IMPORTER_BUFFER::ImportTo( GRAPHICS_IMPORTER& aImporter )
    // in the KiCad drawing area
    else if( aImporter.GetImportOffsetMM() == VECTOR2D( 0, 0 ) )
    {
-        VECTOR2D offset = boundingBox.GetOrigin();
-        aImporter.SetImportOffsetMM( -offset );
+        if( boundingBox.GetRight() > std::numeric_limits<int>::max()
+            || boundingBox.GetBottom() > std::numeric_limits<int>::max()
+            || boundingBox.GetLeft() < std::numeric_limits<int>::min()
+            || boundingBox.GetTop() < std::numeric_limits<int>::min() )
+        {
+            VECTOR2D offset = boundingBox.GetOrigin();
+            aImporter.SetImportOffsetMM( -offset );
+        }
    }
    else
    {
-        VECTOR2D bbox_origin = boundingBox.GetOrigin();
-        aImporter.SetImportOffsetMM( -bbox_origin + aImporter.GetImportOffsetMM() );
-
-        double total_scale_x = aImporter.GetScale().x * aImporter.GetMillimeterToIuFactor();
-        double total_scale_y = aImporter.GetScale().y * aImporter.GetMillimeterToIuFactor();
+        double   total_scale_x = aImporter.GetScale().x * aImporter.GetMillimeterToIuFactor();
+        double   total_scale_y = aImporter.GetScale().y * aImporter.GetMillimeterToIuFactor();

        double max_offset_x =
                ( aImporter.GetImportOffsetMM().x + boundingBox.GetRight() ) * total_scale_x;
@@ -117,7 +117,8 @@ std::map<wxString, wxString> ALTIUM_ASCII_PARSER::ReadProperties()
            if( canonicalKey == wxT( "DESIGNATOR" ) || canonicalKey == wxT( "NAME" )
                || canonicalKey == wxT( "TEXT" ) )
            {
-                value = AltiumPropertyToKiCadString( value );
+                if( kv[ wxT( "RECORD" ) ] != wxT( "4" ) )
+                    value = AltiumPropertyToKiCadString( value );
            }
        }

@@ -493,7 +493,8 @@ std::map<wxString, wxString> ALTIUM_BINARY_PARSER::ReadProperties(
                || canonicalKey == wxT( "NAME" )
                || canonicalKey == wxT( "TEXT" ) )
        {
-            value = AltiumPropertyToKiCadString( value.Trim() );
+            if( kv[ wxT( "RECORD" ) ] != wxT( "4" ) )
+                value = AltiumPropertyToKiCadString( value.Trim() );
        }

        kv.insert( { canonicalKey, value.Trim() } );
@@ -45,40 +45,52 @@ LIB_ID AltiumToKiCadLibID( const wxString& aLibName, const wxString& aLibReferen

 wxString AltiumPropertyToKiCadString( const wxString& aString )
 {
-    wxString converted;
-    bool     inOverbar = false;
+    wxString  output;
+    wxString  tempString;
+    bool      hasPrev = false;
+    wxUniChar prev;

-    for( wxString::const_iterator chIt = aString.begin(); chIt != aString.end(); ++chIt )
+    for( wxString::const_iterator it = aString.begin(); it != aString.end(); ++it )
    {
-        wxString::const_iterator lookahead = chIt + 1;
+        char ch = 0;

-        if( lookahead != aString.end() && *lookahead == '\\' )
+        if( (*it).GetAsChar( &ch ) )
        {
-            if( !inOverbar )
+            if( ch == '\\' )
            {
-                converted += "~{";
-                inOverbar = true;
+                if( hasPrev )
+                {
+                    tempString += prev;
+                    hasPrev = false;
+                }
+
+                continue; // Backslash is ignored and not added to the output
+            }
+        }
+
+        if( hasPrev ) // Two letters in a row with no backslash
+        {
+            if( !tempString.empty() )
+            {
+                output += "~{" + tempString + "}";
+                tempString.Clear();
            }

-            converted += *chIt;
-            chIt = lookahead;
+            output += prev;
        }
-        else
-        {
-            if( inOverbar )
-            {
-                converted += "}";
-                inOverbar = false;
-            }

-            converted += *chIt;
-        }
+        prev = *it;
+        hasPrev = true;
    }

-    if( inOverbar )
-        converted += "}";
+    // Append any leftover escaped string
+    if( !tempString.IsEmpty() )
+        output += "~{" + tempString + "}";

-    return converted;
+    if( hasPrev )
+        output += prev;
+
+    return output;
 }


@@ -148,9 +160,7 @@ wxString AltiumPcbSpecialStringsToKiCadStrings( const wxString&
                                                const std::map<wxString, wxString>& aOverrides )
 {
    if( aString.IsEmpty() )
-    {
        return aString;
-    }

    // special case: string starts with dot -> whole string is special string
    if( aString.at( 0 ) == '.' )
@@ -174,57 +184,15 @@ wxString AltiumPcbSpecialStringsToKiCadStrings( const wxString&

 wxString AltiumPinNamesToKiCad( wxString& aString )
 {
-    wxString  output;
-    wxString  tempString;
-    bool      hasPrev = false;
-    wxUniChar prev;
+    if( aString.IsEmpty() )
+        return wxEmptyString;

+    wxString rest;

-    for( wxString::const_iterator it = aString.begin(); it != aString.end(); ++it )
-    {
-        char ch = 0;
+    if( aString.StartsWith( '\\', &rest ) && !rest.Contains( '\\' ) )
+        return "~{" + rest + "}";

-        if( (*it).GetAsChar( &ch ) )
-        {
-            if( ch == '\\' )
-            {
-                if( hasPrev )
-                {
-                    tempString += prev;
-                    hasPrev = false;
-                }
-
-                continue; // Backslash is ignored and not added to the output
-            }
-        }
-
-        if( hasPrev ) // Two letters in a row with no backslash
-        {
-            if( !tempString.empty() )
-            {
-                output += "~{" + tempString + "}";
-                tempString.Clear();
-            }
-
-            output += prev;
-        }
-
-        prev = *it;
-        hasPrev = true;
-    }
-
-    // Append any leftover escaped string
-    if( !tempString.IsEmpty() )
-    {
-        output += "~{" + tempString + "}";
-    }
-
-    if( hasPrev )
-    {
-        output += prev;
-    }
-
-    return output;
+    return AltiumPropertyToKiCadString( aString );
 }

 VECTOR2I AltiumGetEllipticalPos( double aMajor, double aMinor, double aAngleRadians )
@@ -34,6 +34,7 @@

 #include <functional>
 #include <cstdio>
+#include <array>

 constexpr auto DEFAULT_ALIGNMENT = ETEXT::BOTTOM_LEFT;

@@ -190,10 +191,10 @@ ECOORD::ECOORD( const wxString& aValue, enum ECOORD::EAGLE_UNIT aUnit )
 {
    // This array is used to adjust the fraction part value basing on the number of digits
    // in the fraction.
-    constexpr int DIVIDERS[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 };
-    constexpr unsigned int DIVIDERS_MAX_IDX = sizeof( DIVIDERS ) / sizeof( DIVIDERS[0] ) - 1;
+    static std::array<int, 9> DIVIDERS = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 };

-    int integer, fraction, pre_fraction, post_fraction;
+    int integer, pre_fraction, post_fraction;
+    long long unsigned fraction;

    // The following check is needed to handle correctly negative fractions where the integer
    // part == 0.
@@ -201,7 +202,7 @@ ECOORD::ECOORD( const wxString& aValue, enum ECOORD::EAGLE_UNIT aUnit )

    // %n is used to find out how many digits contains the fraction part, e.g. 0.001 contains 3
    // digits.
-    int ret = sscanf( aValue.c_str(), "%d.%n%d%n", &integer, &pre_fraction, &fraction,
+    int ret = sscanf( aValue.c_str(), "%d.%n%llu%n", &integer, &pre_fraction, &fraction,
                      &post_fraction );

    if( ret == 0 )
@@ -217,11 +218,11 @@ ECOORD::ECOORD( const wxString& aValue, enum ECOORD::EAGLE_UNIT aUnit )

        // adjust the number of digits if necessary as we cannot handle anything smaller than
        // nanometers (rounding).
-        if( (unsigned) digits > DIVIDERS_MAX_IDX )
+        if( digits >= static_cast<int>( DIVIDERS.size() ) )
        {
-            int diff = digits - DIVIDERS_MAX_IDX;
-            digits = DIVIDERS_MAX_IDX;
-            fraction /= DIVIDERS[diff];
+            long long unsigned denom = pow( 10, digits - DIVIDERS.size() + 1 );
+            digits = DIVIDERS.size() - 1;
+            fraction /= denom;
        }

        int frac_value = ConvertToNm( fraction, aUnit ) / DIVIDERS[digits];
@@ -815,11 +816,11 @@ EPAD::EPAD( wxXmlNode* aPad )
          >
    */

-    // #REQUIRED says DTD, throw exception if not found
-    drill        = parseRequiredAttribute<ECOORD>( aPad, "drill" );
+    // #REQUIRED says DTD, but DipTrace doesn't write it sometimes
+    drill = parseOptionalAttribute<ECOORD>( aPad, "drill" );

    // Optional attributes
-    diameter     = parseOptionalAttribute<ECOORD>( aPad, "diameter" );
+    diameter = parseOptionalAttribute<ECOORD>( aPad, "diameter" );

    opt_wxString s = parseOptionalAttribute<wxString>( aPad, "shape" );

@@ -711,7 +711,7 @@ struct EPAD_COMMON
 /// Eagle thru hole pad
 struct EPAD : public EPAD_COMMON
 {
-    ECOORD     drill;
+    opt_ecoord drill;
    opt_ecoord diameter;

    // for shape: (square | round | octagon | long | offset)
@@ -118,7 +118,8 @@ static int progressinfo( void* aProgress, double aDLtotal, double aDLnow, double


 KICAD_CURL_EASY::KICAD_CURL_EASY() :
-        m_headers( nullptr )
+        m_headers( nullptr ),
+        m_curlSharedLock( KICAD_CURL::Mutex() )
 {
    m_CURL = curl_easy_init();

@@ -194,12 +195,6 @@ KICAD_CURL_EASY::~KICAD_CURL_EASY()

 int KICAD_CURL_EASY::Perform()
 {
-    std::shared_lock lock( KICAD_CURL::Mutex(), std::try_to_lock );
-
-    // If can't lock, we should be in the process of tearing down.
-    if( !lock )
-        return CURLE_ABORTED_BY_CALLBACK;
-
    if( m_headers )
        curl_easy_setopt( m_CURL, CURLOPT_HTTPHEADER, m_headers );

@@ -37,6 +37,8 @@

 #include <cctype>
 #include <mutex>
+#include <utility>
+#include <stdlib.h>

 #include <wx/log.h>

@@ -113,7 +115,7 @@ KIID::KIID( const std::string& aString ) :
        m_uuid(),
        m_cached_timestamp( 0 )
 {
-    if( aString.length() == 8
+    if( !aString.empty() && aString.length() <= 8
        && std::all_of( aString.begin(), aString.end(),
                        []( unsigned char c )
                        {
@@ -123,9 +125,15 @@ KIID::KIID( const std::string& aString ) :
        // A legacy-timestamp-based UUID has only the last 4 octets filled in.
        // Convert them individually to avoid stepping in the little-endian/big-endian
        // doo-doo.
-        for( int i = 0; i < 4; ++i )
+        for( int i = 0; i < 4; i++ )
        {
-            std::string octet = aString.substr( i * 2, 2 );
+            int start = static_cast<int>( aString.length() ) - 8 + i * 2;
+            int end = start + 2;
+
+            start = std::max( 0, start );
+            int len = std::max( 0, end - start );
+
+            std::string octet = aString.substr( start, len );
            m_uuid.data[i + 12] = strtol( octet.data(), nullptr, 16 );
        }

@@ -33,6 +33,7 @@
 #include <lib_table_lexer.h>
 #include <macros.h>
 #include <string_utils.h>
+#include <build_version.h>

 #define OPT_SEP     '|'         ///< options separator character

@@ -434,9 +435,17 @@ bool LIB_TABLE::migrate()
        wxString uri = row.GetFullURI( true );

        // If the uri still has a variable in it, that means that the user does not have
-        // these vars defined.  We update the old vars to the KICAD7 versions on load
-        row_updated |= ( uri.Replace( wxS( "${KICAD5_" ), wxS( "${KICAD7_" ), false ) > 0 );
-        row_updated |= ( uri.Replace( wxS( "${KICAD6_" ), wxS( "${KICAD7_" ), false ) > 0 );
+        // these vars defined.  We update the old vars to the current versions on load
+
+        static wxString fmtStr = wxS( "${KICAD%d_" );
+        int version = 0;
+        std::tie(version, std::ignore, std::ignore) = GetMajorMinorPatchTuple();
+
+        for( int ii = 5; ii < version - 1; ++ii )
+        {
+            row_updated |= ( uri.Replace( wxString::Format( fmtStr, ii ),
+                                          wxString::Format( fmtStr, version ), false ) > 0 );
+        }

        if( row_updated )
        {
@@ -281,17 +281,21 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a

        m_tree.ResetScore();

-        wxStringTokenizer tokenizer( aSearch );
-        bool              firstTerm = true;
+        // Don't cause KiCad to hang if someone accidentally pastes the PCB or schematic into
+        // the search box.
+        constexpr int MAX_TERMS = 100;

-        while( tokenizer.HasMoreTokens() )
+        wxStringTokenizer tokenizer( aSearch );
+        int               termCount = 0;
+
+        while( tokenizer.HasMoreTokens() && termCount < MAX_TERMS )
        {
            // First search for the full token, in case it appears in a search string
            wxString             term = tokenizer.GetNextToken().Lower();
            EDA_COMBINED_MATCHER termMatcher( term, CTX_LIBITEM );

-            m_tree.UpdateScore( &termMatcher, wxEmptyString, firstTerm ? m_filter : nullptr );
-            firstTerm = false;
+            m_tree.UpdateScore( &termMatcher, wxEmptyString, m_filter );
+            termCount++;

            if( term.Contains( ":" ) )
            {
@@ -304,7 +308,7 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a
            }
        }

-        if( firstTerm )
+        if( termCount == 0 )
        {
            // No terms processed; just run the filter
            m_tree.UpdateScore( nullptr, wxEmptyString, m_filter );
@@ -1092,3 +1092,35 @@ GAL_SET GAL_SET::DefaultVisible()
    static const GAL_SET saved( visible, arrayDim( visible ) );
    return saved;
 }
+
+
+/// The layers the user has control over the visibility of, stored in project local settings
+GAL_SET GAL_SET::UserVisbilityLayers()
+{
+    static const GAL_LAYER_ID layers[] = {
+        LAYER_TRACKS,
+        LAYER_VIAS,
+        LAYER_PADS,
+        LAYER_ZONES,
+        LAYER_DRAW_BITMAPS,
+        LAYER_FOOTPRINTS_FR,
+        LAYER_FOOTPRINTS_BK,
+        LAYER_PADS_TH,
+        LAYER_FP_VALUES,
+        LAYER_FP_REFERENCES,
+        LAYER_FP_TEXT,
+        LAYER_HIDDEN_TEXT,
+        LAYER_ANCHOR,
+        LAYER_RATSNEST,
+        LAYER_DRC_WARNING,
+        LAYER_DRC_ERROR,
+        LAYER_DRC_EXCLUSION,
+        LAYER_LOCKED_ITEM_SHADOW,
+        LAYER_CONFLICTS_SHADOW,
+        LAYER_DRAWINGSHEET,
+        LAYER_GRID,
+    };
+
+    static const GAL_SET saved( layers, arrayDim( layers ) );
+    return saved;
+}
@@ -107,6 +107,17 @@ bool MARKER_BASE::HitTestMarker( const VECTOR2I& aHitPosition, int aAccuracy ) c
 }


+bool MARKER_BASE::HitTestMarker( const BOX2I& aRect, bool aContained, int aAccuracy ) const
+{
+    const BOX2I bbox = GetBoundingBoxMarker().Inflate( aAccuracy );
+
+    if( aContained )
+        return aRect.Contains( bbox );
+
+    return aRect.Intersects( bbox );
+}
+
+
 void MARKER_BASE::ShapeToPolygon( SHAPE_LINE_CHAIN& aPolygon, int aScale ) const
 {
    if( aScale < 0 )
@@ -777,6 +777,14 @@ void PDF_PLOTTER::ClosePage()
                VECTOR2D retval = VECTOR2D( aCoord ) * PTsPERMIL / ( m_IUsPerDecimil * 10 );
                // PDF y=0 is at bottom of page, invert coordinate
                retval.y = psPaperSize.y - retval.y;
+
+                // The pdf plot can be mirrored (from left to right). So mirror the
+                // x coordinate if m_plotMirror is set
+                if( m_plotMirror )
+                {
+                    retval.x = ( psPaperSize.x - retval.x );
+                }
+
                return retval;
            };

@@ -174,12 +174,12 @@ bool PROJECT_ARCHIVER::Archive( const wxString& aSrcDir, const wxString& aDestFi
    wxArrayString files;

    for( unsigned ii = 0; ii < arrayDim( extensionList ); ii++ )
-        wxDir::GetAllFiles( aSrcDir, &files, extensionList[ii] );
+        wxDir::GetAllFiles( aSrcDir, &files, extensionList[ii], wxDIR_FILES | wxDIR_DIRS );

    if( aIncludeExtraFiles )
    {
        for( unsigned ii = 0; ii < arrayDim( extraExtensionList ); ii++ )
-            wxDir::GetAllFiles( aSrcDir, &files, extraExtensionList[ii] );
+            wxDir::GetAllFiles( aSrcDir, &files, extraExtensionList[ii], wxDIR_FILES | wxDIR_DIRS );
    }

    for( unsigned ii = 0; ii < files.GetCount(); ++ii )
@@ -41,7 +41,8 @@ PROJECT_FILE::PROJECT_FILE( const wxString& aFullPath ) :
        m_BoardSettings(),
        m_sheets(),
        m_boards(),
-        m_project( nullptr )
+        m_project( nullptr ),
+        m_wasMigrated( false )
 {
    // Keep old files around
    m_deleteLegacyAfterMigration = false;
@@ -588,7 +589,14 @@ bool PROJECT_FILE::SaveToFile( const wxString& aDirectory, bool aForce )

    Set( "meta.filename", m_project->GetProjectName() + "." + FILEEXT::ProjectFileExtension );

-    return JSON_SETTINGS::SaveToFile( aDirectory, aForce );
+    // Even if parameters were not modified, we should resave after migration
+    bool force = aForce || m_wasMigrated;
+
+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
+    return JSON_SETTINGS::SaveToFile( aDirectory, force );
 }


@@ -630,6 +638,10 @@ bool PROJECT_FILE::SaveAs( const wxString& aDirectory, const wxString& aFile )
    updatePathByPtr( "schematic.ngspice.workbook_filename" );
    updatePathByPtr( "pcbnew.page_layout_descr_file" );

+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
    // While performing Save As, we have already checked that we can write to the directory
    // so don't carry the previous flag
    SetReadOnly( false );
@@ -42,7 +42,8 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
        m_ZoneOpacity( 0.6 ),
        m_ImageOpacity( 0.6 ),
        m_SelectionFilter(),
-        m_project( aProject )
+        m_project( aProject ),
+        m_wasMigrated( false )
 {
    // Keep old files around
    m_deleteLegacyAfterMigration = false;
@@ -77,20 +78,23 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
                    return;
                }

-                m_VisibleItems.reset();
+                m_VisibleItems &= ~GAL_SET::UserVisbilityLayers();
+                GAL_SET visible;

                for( const nlohmann::json& entry : aVal )
                {
                    try
                    {
                        int i = entry.get<int>();
-                        m_VisibleItems.set( i );
+                        visible.set( i );
                    }
                    catch( ... )
                    {
                        // Non-integer or out of range entry in the array; ignore
                    }
                }
+
+                m_VisibleItems |= GAL_SET::UserVisbilityLayers() & visible;
            },
            {} ) );

@@ -272,6 +276,8 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
                    {
                        At( "board" ).erase( "visible_items" );
                    }
+
+                    m_wasMigrated = true;
                }

                return true;
@@ -330,6 +336,7 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
                    }

                    At( "board" )["visible_items"] = visible;
+                    m_wasMigrated = true;
                }

                return true;
@@ -354,7 +361,14 @@ bool PROJECT_LOCAL_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce

    Set( "meta.filename", m_project->GetProjectName() + "." + FILEEXT::ProjectLocalSettingsFileExtension );

-    return JSON_SETTINGS::SaveToFile( aDirectory, aForce );
+    // Even if parameters were not modified, we should resave after migration
+    bool force = aForce || m_wasMigrated;
+
+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
+    return JSON_SETTINGS::SaveToFile( aDirectory, force );
 }


@@ -363,6 +377,10 @@ bool PROJECT_LOCAL_SETTINGS::SaveAs( const wxString& aDirectory, const wxString&
    Set( "meta.filename", aFile + "." + FILEEXT::ProjectLocalSettingsFileExtension );
    SetFilename( aFile );

+    // If we're actually going ahead and doing the save, the flag that keeps code from doing the save
+    // should be cleared at this point
+    m_wasMigrated = false;
+
    return JSON_SETTINGS::SaveToFile( aDirectory, true );
 }

@@ -540,8 +540,12 @@ wxValidator* PGPROPERTY_ANGLE::DoGetValidator() const

 wxSize PGPROPERTY_COLORENUM::OnMeasureImage( int aItem ) const
 {
-    // TODO(JE) calculate size from window metrics?
-    return wxSize( 16, 12 );
+    wxSize size( 16, -1 );
+
+    if( wxPropertyGrid* pg = GetGrid() )
+        size = pg->FromDIP( size );
+
+    return size;
 }


@@ -79,6 +79,7 @@ JSON_SETTINGS::JSON_SETTINGS( const wxString& aFilename, SETTINGS_LOC aLocation,
        m_deleteLegacyAfterMigration( true ),
        m_resetParamsIfMissing( true ),
        m_schemaVersion( aSchemaVersion ),
+        m_isFutureFormat( false ),
        m_manager( nullptr )
 {
    m_internals = std::make_unique<JSON_SETTINGS_INTERNALS>();
@@ -325,6 +326,7 @@ bool JSON_SETTINGS::LoadFromFile( const wxString& aDirectory )
                    wxLogTrace( traceSettings,
                                wxT( "%s: warning: file version %d is newer than latest (%d)" ),
                                GetFullFilename(), filever, m_schemaVersion );
+                    m_isFutureFormat = true;
                }
            }
            else
@@ -46,6 +46,7 @@
 #include <settings/json_settings_internals.h>
 #include <settings/settings_manager.h>
 #include <wildcards_and_files_ext.h>
+#include <env_vars.h>


 SETTINGS_MANAGER::SETTINGS_MANAGER( bool aHeadless ) :
@@ -154,6 +155,13 @@ void SETTINGS_MANAGER::Save()
        if( dynamic_cast<COLOR_SETTINGS*>( settings.get() ) )
            continue;

+        // Never automatically save project settings, caller should use SaveProject or UnloadProject
+        if( dynamic_cast<PROJECT_FILE*>( settings.get() )
+            || dynamic_cast<PROJECT_LOCAL_SETTINGS*>( settings.get() ) )
+        {
+            continue;
+        }
+
        settings->SaveToFile( GetPathForSettingsFile( settings.get() ) );
    }
 }
@@ -343,7 +351,7 @@ void SETTINGS_MANAGER::loadAllColorSettings()

    wxFileName third_party_path;
    const ENV_VAR_MAP& env = Pgm().GetLocalEnvVariables();
-    auto               it = env.find( wxS( "KICAD7_3RD_PARTY" ) );
+    auto               it = env.find( ENV_VAR::GetVersionedEnvVarName( wxS( "3RD_PARTY" ) ) );

    if( it != env.end() && !it->second.GetValue().IsEmpty() )
        third_party_path.SetPath( it->second.GetValue() );
@@ -1177,6 +1185,9 @@ bool SETTINGS_MANAGER::unloadProjectFile( PROJECT* aProject, bool aSave )

    PROJECT_FILE* file = m_project_files[name];

+    if( !file->ShouldAutoSave() )
+        aSave = false;
+
    auto it = std::find_if( m_settings.begin(), m_settings.end(),
                            [&file]( const std::unique_ptr<JSON_SETTINGS>& aPtr )
                            {
@@ -1187,7 +1198,9 @@ bool SETTINGS_MANAGER::unloadProjectFile( PROJECT* aProject, bool aSave )
    {
        wxString projectPath = GetPathForSettingsFile( it->get() );

-        FlushAndRelease( &aProject->GetLocalSettings(), aSave );
+        bool saveLocalSettings = aSave && aProject->GetLocalSettings().ShouldAutoSave();
+
+        FlushAndRelease( &aProject->GetLocalSettings(), saveLocalSettings );

        if( aSave )
            ( *it )->SaveToFile( projectPath );
@@ -694,6 +694,8 @@ void VIEW::ReorderLayerData( std::unordered_map<int, int> aReorderMap )
    // Transfer reordered data (using the copy assignment operator ):
    m_layers = new_map;

+    sortLayers();
+
    for( VIEW_ITEM* item : *m_allItems )
    {
        VIEW_ITEM_DATA* viewData = item->viewPrivData();
@@ -36,9 +36,6 @@ FOOTPRINT_PREVIEW_WIDGET::FOOTPRINT_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aK
 {
    m_prev_panel = FOOTPRINT_PREVIEW_PANEL_BASE::Create( this, aKiway );

-    if( !m_prev_panel )
-        return;
-
    m_statusPanel = new wxPanel( this );
    m_status = new wxStaticText( m_statusPanel, wxID_ANY, wxEmptyString );
    m_statusSizer = new wxBoxSizer( wxVERTICAL );
@@ -47,19 +44,25 @@ FOOTPRINT_PREVIEW_WIDGET::FOOTPRINT_PREVIEW_WIDGET( wxWindow* aParent, KIWAY& aK
    m_statusSizer->Add( 0, 0, 1 );  // add a spacer
    m_statusPanel->SetSizer( m_statusSizer );

-    // Give the status panel the same color scheme as the canvas so it isn't jarring when
-    // switched to
-    m_statusPanel->SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
-    m_statusPanel->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
-    m_status->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+    if( m_prev_panel )
+    {
+        // Give the status panel the same color scheme as the canvas so it isn't jarring when
+        // switched to
+        m_statusPanel->SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
+        m_statusPanel->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+        m_status->SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );

-    // Set our background so wx doesn't render a normal control background momentarily when
-    // rapidly navigating with arrow keys
-    SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
-    SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+        // Set our background so wx doesn't render a normal control background momentarily when
+        // rapidly navigating with arrow keys
+        SetBackgroundColour( m_prev_panel->GetBackgroundColor().ToColour() );
+        SetForegroundColour( m_prev_panel->GetForegroundColor().ToColour() );
+    }

    m_outerSizer = new wxBoxSizer( wxVERTICAL );
-    m_outerSizer->Add( m_prev_panel->GetWindow(), 1, wxALL | wxEXPAND, 0 );
+
+    if( m_prev_panel )
+        m_outerSizer->Add( m_prev_panel->GetWindow(), 1, wxALL | wxEXPAND, 0 );
+
    m_outerSizer->Add( m_statusPanel, 1, wxALL | wxEXPAND, 0 );

    SetSizer( m_outerSizer );
@@ -72,7 +75,10 @@ void FOOTPRINT_PREVIEW_WIDGET::SetStatusText( wxString const& aText )
 {
    m_status->SetLabel( aText );
    m_statusPanel->Show();
-    m_prev_panel->GetWindow()->Hide();
+
+    if( m_prev_panel )
+        m_prev_panel->GetWindow()->Hide();
+
    Layout();
 }

@@ -81,20 +87,25 @@ void FOOTPRINT_PREVIEW_WIDGET::ClearStatus()
 {
    m_status->SetLabel( wxEmptyString );
    m_statusPanel->Hide();
-    m_prev_panel->GetWindow()->Show();
+
+    if( m_prev_panel )
+        m_prev_panel->GetWindow()->Show();
+
    Layout();
 }


 void FOOTPRINT_PREVIEW_WIDGET::SetUserUnits( EDA_UNITS aUnits )
 {
-    m_prev_panel->SetUserUnits( aUnits );
+    if( m_prev_panel )
+        m_prev_panel->SetUserUnits( aUnits );
 }


 void FOOTPRINT_PREVIEW_WIDGET::SetPinFunctions( const std::map<wxString, wxString>& aPinFunctions )
 {
-    m_prev_panel->SetPinFunctions( aPinFunctions );
+    if( m_prev_panel )
+        m_prev_panel->SetPinFunctions( aPinFunctions );
 }


@@ -122,34 +133,32 @@ void FOOTPRINT_PREVIEW_WIDGET::DisplayFootprints( std::shared_ptr<FOOTPRINT> aFo
                                                  std::shared_ptr<FOOTPRINT> aFootprintB )
 {
    ClearStatus();
-    m_prev_panel->DisplayFootprints( aFootprintA, aFootprintB );
+
+    if( m_prev_panel )
+        m_prev_panel->DisplayFootprints( aFootprintA, aFootprintB );
 }


 void FOOTPRINT_PREVIEW_WIDGET::RefreshAll()
 {
-    m_prev_panel->RefreshAll();
+    if( m_prev_panel )
+        m_prev_panel->RefreshAll();
 }


 FOOTPRINT_PREVIEW_PANEL_BASE* FOOTPRINT_PREVIEW_PANEL_BASE::Create( wxWindow* aParent,
                                                                    KIWAY& aKiway )
 {
-    FOOTPRINT_PREVIEW_PANEL_BASE* panel = nullptr;
+    wxWindow* panel = nullptr;

    try
    {
-        KIFACE*   kiface = aKiway.KiFACE( KIWAY::FACE_PCB );
-        wxWindow* window = kiface->CreateKiWindow( aParent, FRAME_FOOTPRINT_PREVIEW, &aKiway );
-
-        panel = dynamic_cast<FOOTPRINT_PREVIEW_PANEL_BASE*>( window );
-
-        if( window && !panel )
-            delete window;
+        if( KIFACE* kiface = aKiway.KiFACE( KIWAY::FACE_PCB ) )
+            panel = kiface->CreateKiWindow( aParent, FRAME_FOOTPRINT_PREVIEW, &aKiway );
    }
    catch( ... )
    {
    }

-    return panel;
+    return dynamic_cast<FOOTPRINT_PREVIEW_PANEL_BASE*>( panel );
 }
@@ -171,7 +171,7 @@ class TEXT_BUTTON_SYMBOL_CHOOSER : public wxComboCtrl
 public:
    TEXT_BUTTON_SYMBOL_CHOOSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg,
                                const wxString& aPreselect ) :
-            wxComboCtrl( aParent ),
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ) ),
            m_dlg( aParentDlg ),
            m_preselect( aPreselect )
    {
@@ -233,7 +233,7 @@ class TEXT_BUTTON_FP_CHOOSER : public wxComboCtrl
 public:
    TEXT_BUTTON_FP_CHOOSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg,
                            const wxString& aSymbolNetlist, const wxString& aPreselect ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ),
                         wxTE_PROCESS_ENTER | wxBORDER_NONE ),
            m_dlg( aParentDlg ),
            m_preselect( aPreselect ),
@@ -324,7 +324,7 @@ class TEXT_BUTTON_URL : public wxComboCtrl
 {
 public:
    TEXT_BUTTON_URL( wxWindow* aParent, DIALOG_SHIM* aParentDlg, SEARCH_STACK* aSearchStack ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(0, 0),
                         wxTE_PROCESS_ENTER | wxBORDER_NONE ),
            m_dlg( aParentDlg ),
            m_searchStack( aSearchStack )
@@ -379,7 +379,7 @@ public:
                              wxString* aCurrentDir, const wxString& aFileFilter = wxEmptyString,
                              bool aNormalize = false,
                              const wxString& aNormalizeBasePath = wxEmptyString ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ),
                         wxTE_PROCESS_ENTER | wxBORDER_NONE ),
            m_dlg( aParentDlg ),
            m_grid( aGrid ),
@@ -399,7 +399,7 @@ public:
                              std::function<wxString( WX_GRID* grid, int row )> aFileFilterFn,
                              bool aNormalize = false,
                              const wxString& aNormalizeBasePath = wxEmptyString ) :
-            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 0, 0 ),
                         wxTE_PROCESS_ENTER | wxBORDER_NONE ),
            m_dlg( aParentDlg ),
            m_grid( aGrid ),
@@ -133,7 +133,7 @@ void GRID_CELL_STC_EDITOR::SetSize( const wxRect& aRect )

 void GRID_CELL_STC_EDITOR::Create( wxWindow* aParent, wxWindowID aId, wxEvtHandler* aEventHandler )
 {
-    m_control = new wxStyledTextCtrl( aParent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+    m_control = new wxStyledTextCtrl( aParent, wxID_ANY, wxDefaultPosition, wxSize( 0, 0 ),
                                      wxBORDER_NONE );

    stc_ctrl()->SetTabIndents( false );
@@ -34,6 +34,7 @@


 BEGIN_EVENT_TABLE( EDA_MSG_PANEL, wxPanel )
+    EVT_DPI_CHANGED( EDA_MSG_PANEL::OnDPIChanged )
    EVT_PAINT( EDA_MSG_PANEL::OnPaint )
 END_EVENT_TABLE()

@@ -50,7 +51,9 @@ EDA_MSG_PANEL::EDA_MSG_PANEL( wxWindow* aParent, int aId, const wxPoint& aPositi

    m_last_x = 0;

-    m_fontSize = GetTextExtent( wxT( "W" ) );
+    updateFontSize();
+
+    InvalidateBestSize();
 }


@@ -59,16 +62,31 @@ EDA_MSG_PANEL::~EDA_MSG_PANEL()
 }


-int EDA_MSG_PANEL::GetRequiredHeight( wxWindow* aWindow )
+void EDA_MSG_PANEL::updateFontSize()
 {
-    wxSize     fontSizeInPixels;
-    wxWindowDC dc( aWindow );
+    wxFont font = KIUI::GetControlFont( this );
+    GetTextExtent( wxT( "W" ), &m_fontSize.x, &m_fontSize.y, 0, 0, &font );
+}

-    dc.SetFont( KIUI::GetControlFont( aWindow ) );
-    dc.GetTextExtent( wxT( "W" ), &fontSizeInPixels.x, &fontSizeInPixels.y );

-    // make space for two rows of text plus a number of pixels between them.
-    return 2 * fontSizeInPixels.y + 0;
+wxSize EDA_MSG_PANEL::DoGetBestSize() const
+{
+    return wxSize( wxDefaultCoord, 2 * m_fontSize.y + 0 );
+}
+
+
+wxSize EDA_MSG_PANEL::DoGetBestClientSize() const
+{
+    return wxPanel::DoGetBestClientSize();
+}
+
+
+void EDA_MSG_PANEL::OnDPIChanged( wxDPIChangedEvent& aEvent )
+{
+    updateFontSize();
+    InvalidateBestSize();
+
+    aEvent.Skip();
 }


@@ -300,18 +300,6 @@ WIDGET_HOTKEY_CLIENT_DATA* WIDGET_HOTKEY_LIST::getHKClientData( wxTreeListItem a
 }


-WIDGET_HOTKEY_CLIENT_DATA* WIDGET_HOTKEY_LIST::getExpectedHkClientData( wxTreeListItem aItem )
-{
-    const auto hkdata = getHKClientData( aItem );
-
-    // This probably means a hotkey-only action is being attempted on
-    // a row that is not a hotkey (like a section heading)
-    wxASSERT_MSG( hkdata != nullptr, "No hotkey data found for list item" );
-
-    return hkdata;
-}
-
-
 void WIDGET_HOTKEY_LIST::updateFromClientData()
 {
    for( wxTreeListItem i = GetFirstItem(); i.IsOk(); i = GetNextItem( i ) )
@@ -369,7 +357,7 @@ void WIDGET_HOTKEY_LIST::changeHotkey( HOTKEY& aHotkey, long aKey, bool alternat

 void WIDGET_HOTKEY_LIST::editItem( wxTreeListItem aItem, int aEditId )
 {
-    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getExpectedHkClientData( aItem );
+    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getHKClientData( aItem );

    if( !hkdata )
        return;
@@ -403,7 +391,7 @@ void WIDGET_HOTKEY_LIST::editItem( wxTreeListItem aItem, int aEditId )

 void WIDGET_HOTKEY_LIST::resetItem( wxTreeListItem aItem, int aResetId )
 {
-    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getExpectedHkClientData( aItem );
+    WIDGET_HOTKEY_CLIENT_DATA* hkdata = getHKClientData( aItem );

    if( !hkdata )
        return;
@@ -58,12 +58,11 @@ WX_INFOBAR::WX_INFOBAR( wxWindow* aParent, wxAuiManager* aMgr, wxWindowID aWinid
 {
    m_showTimer = new wxTimer( this, ID_CLOSE_INFOBAR );

+    wxColour fg, bg;
+    KIPLATFORM::UI::GetInfoBarColours( fg, bg );
+    SetBackgroundColour( bg );
+    SetForegroundColour( fg );
 #ifdef __WXMAC__
-    // wxWidgets hard-codes wxSYS_COLOUR_INFOBK to { 0xFF, 0xFF, 0xD3 } on Mac.
-    if( KIPLATFORM::UI::IsDarkTheme() )
-        SetBackgroundColour( wxColour( 28, 27, 20 ) );
-    else
-        SetBackgroundColour( wxColour( 255, 249, 189 ) );

    // Infobar is broken on Mac without the effects
    SetShowHideEffects( wxSHOW_EFFECT_ROLL_TO_BOTTOM, wxSHOW_EFFECT_ROLL_TO_TOP );
@@ -125,6 +125,7 @@ wxString AddFileExtListToFilter( const std::vector<std::string>& aExts )
 const std::string FILEEXT::BackupFileSuffix( "-bak" );
 const std::string FILEEXT::LockFilePrefix( "~" );
 const std::string FILEEXT::LockFileExtension( "lck" );
+const std::string FILEEXT::AutoSaveFilePrefix( "_autosave-" );

 const std::string FILEEXT::KiCadSymbolLibFileExtension( "kicad_sym" );
 const std::string FILEEXT::SchematicSymbolFileExtension( "sym" );
@@ -371,20 +371,20 @@ void DISPLAY_FOOTPRINTS_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )

 WINDOW_SETTINGS* DISPLAY_FOOTPRINTS_FRAME::GetWindowSettings( APP_SETTINGS_BASE* aCfg )
 {
-    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>();
+    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
    return &cfg->m_FootprintViewer;
 }


 PCB_VIEWERS_SETTINGS_BASE* DISPLAY_FOOTPRINTS_FRAME::GetViewerSettingsBase() const
 {
-    return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>();
+    return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
 }


 MAGNETIC_SETTINGS* DISPLAY_FOOTPRINTS_FRAME::GetMagneticItemsSettings()
 {
-    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>();
+    CVPCB_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
    return &cfg->m_FootprintViewerMagneticSettings;
 }

@@ -525,6 +525,7 @@ void DISPLAY_FOOTPRINTS_FRAME::InitDisplay()
        }

        GetBoard()->Add( footprint );
+        GetCanvas()->GetView()->Update( footprint );
        m_currentFootprint = footprintName;
        m_currentComp = comp;
        setFPWatcher( footprint );
@@ -579,10 +580,10 @@ void DISPLAY_FOOTPRINTS_FRAME::UpdateMsgPanel()

 COLOR_SETTINGS* DISPLAY_FOOTPRINTS_FRAME::GetColorSettings( bool aForceRefresh ) const
 {
-    auto* settings = Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>();
+    auto* cfg = Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( "fpedit" );

-    if( settings )
-        return Pgm().GetSettingsManager().GetColorSettings( settings->m_ColorTheme );
+    if( cfg )
+        return Pgm().GetSettingsManager().GetColorSettings( cfg->m_ColorTheme );
    else
        return Pgm().GetSettingsManager().GetColorSettings();
 }
@@ -275,7 +275,9 @@ void CONNECTION_SUBGRAPH::getAllConnectedItems( std::set<std::pair<SCH_SHEET_PAT

    while( sg->m_absorbed_by )
    {
-        wxASSERT( sg->m_graph == sg->m_absorbed_by->m_graph );
+        // Using wxCHECK2 with continue statement causes a crash later in the connection
+        // graph rebuild.  See https://gitlab.com/kicad/code/kicad/-/issues/18136.
+        wxCHECK( sg->m_graph == sg->m_absorbed_by->m_graph, /* void */ );
        sg = sg->m_absorbed_by;
    }

@@ -453,7 +455,7 @@ const wxString CONNECTION_SUBGRAPH::GetNetclassForDriver( SCH_ITEM* aItem ) cons

 void CONNECTION_SUBGRAPH::Absorb( CONNECTION_SUBGRAPH* aOther )
 {
-    wxASSERT( m_sheet == aOther->m_sheet );
+    wxCHECK( m_sheet == aOther->m_sheet, /* void */ );

    for( SCH_ITEM* item : aOther->m_items )
    {
@@ -752,9 +754,9 @@ void CONNECTION_GRAPH::Recalculate( const SCH_SHEET_LIST& aSheetList, bool aUnco
            }
            else if( item->Type() == SCH_SHEET_T )
            {
-                SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
+                SCH_SHEET* sheetItem = static_cast<SCH_SHEET*>( item );

-                for( SCH_SHEET_PIN* pin : sheet->GetPins() )
+                for( SCH_SHEET_PIN* pin : sheetItem->GetPins() )
                {
                    if( pin->IsConnectivityDirty() )
                    {
@@ -827,14 +829,14 @@ std::set<std::pair<SCH_SHEET_PATH, SCH_ITEM*>> CONNECTION_GRAPH::ExtractAffected
        // Find the primary subgraph on this sheet
        while( aSubgraph->m_absorbed_by )
        {
-            wxASSERT( aSubgraph->m_graph == aSubgraph->m_absorbed_by->m_graph );
+            wxCHECK2( aSubgraph->m_graph == aSubgraph->m_absorbed_by->m_graph, continue );
            aSubgraph = aSubgraph->m_absorbed_by;
        }

        // Find the top most connected subgraph on all sheets
        while( aSubgraph->m_hier_parent )
        {
-            wxASSERT( aSubgraph->m_graph == aSubgraph->m_hier_parent->m_graph );
+            wxCHECK2( aSubgraph->m_graph == aSubgraph->m_hier_parent->m_graph, continue );
            aSubgraph = aSubgraph->m_hier_parent;
        }

@@ -848,9 +850,11 @@ std::set<std::pair<SCH_SHEET_PATH, SCH_ITEM*>> CONNECTION_GRAPH::ExtractAffected

        if( !item_sg )
        {
-            wxLogTrace( ConnTrace, wxT( "Item %s not found in connection graph" ), aItem->GetTypeDesc() );
+            wxLogTrace( ConnTrace, wxT( "Item %s not found in connection graph" ),
+                        aItem->GetTypeDesc() );
            return;
        }
+
        if( !item_sg->ResolveDrivers( true ) )
        {
            wxLogTrace( ConnTrace, wxT( "Item %s in subgraph %ld (%p) has no driver" ),
@@ -1333,12 +1337,12 @@ void CONNECTION_GRAPH::buildItemSubGraphs()
    // Recache all bus aliases for later use
    wxCHECK_RET( m_schematic, wxS( "Connection graph cannot be built without schematic pointer" ) );

-    SCH_SHEET_LIST all_sheets = m_schematic->GetSheets();
+    SCH_SCREENS screens( m_schematic->Root() );

-    for( unsigned i = 0; i < all_sheets.size(); i++ )
+    for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
    {
-        for( const std::shared_ptr<BUS_ALIAS>& alias : all_sheets[i].LastScreen()->GetBusAliases() )
-            m_bus_alias_cache[ alias->GetName() ] = alias;
+        for( const std::shared_ptr<BUS_ALIAS>& alias : screen->GetBusAliases() )
+            m_bus_alias_cache[alias->GetName()] = alias;
    }

    // Build subgraphs from items (on a per-sheet basis)
@@ -1386,7 +1390,7 @@ void CONNECTION_GRAPH::buildItemSubGraphs()

                    SCH_CONNECTION* connected_conn = connected_item->Connection( &sheet );

-                    wxASSERT( connected_conn );
+                    wxCHECK2( connected_conn, continue );

                    if( connected_conn->SubgraphCode() == 0 )
                    {
@@ -1536,7 +1540,7 @@ void CONNECTION_GRAPH::collectAllDriverValues()
            case SCH_PIN_T:
            {
                SCH_PIN* pin = static_cast<SCH_PIN*>( driver );
-                wxASSERT( pin->IsGlobalPower() );
+                wxCHECK( pin->IsGlobalPower(), /* void */ );
                m_global_label_cache[name].push_back( subgraph );
                break;
            }
@@ -1972,9 +1976,10 @@ void CONNECTION_GRAPH::processSubGraphs()
                        }
                        else
                        {
-                            wxASSERT( driver->Type() == SCH_LABEL_T ||
+                            wxCHECK2( driver->Type() == SCH_LABEL_T ||
                                      driver->Type() == SCH_GLOBAL_LABEL_T ||
-                                      driver->Type() == SCH_HIER_LABEL_T );
+                                      driver->Type() == SCH_HIER_LABEL_T,
+                                      continue );

                            if( subgraph->GetNameForDriver( driver )  == test_name )
                            {
@@ -1996,7 +2001,7 @@ void CONNECTION_GRAPH::processSubGraphs()
                        subgraph->m_bus_neighbors[member].insert( candidate );
                        candidate->m_bus_parents[member].insert( subgraph );
                    }
-                    else if( connection->Type() == candidate->m_driver_connection->Type() )
+                    else if( !connection->IsBus() || connection->Type() == candidate->m_driver_connection->Type() )
                    {
                        wxLogTrace( ConnTrace, wxS( "%lu (%s) absorbs neighbor %lu (%s)" ),
                                    subgraph->m_code, connection->Name(),
@@ -2051,12 +2056,12 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
    // Recache all bus aliases for later use
    wxCHECK_RET( m_schematic, wxT( "Connection graph cannot be built without schematic pointer" ) );

-    SCH_SHEET_LIST all_sheets = m_schematic->GetSheets();
+    SCH_SCREENS screens( m_schematic->Root() );

-    for( unsigned i = 0; i < all_sheets.size(); i++ )
+    for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
    {
-        for( const std::shared_ptr<BUS_ALIAS>& alias : all_sheets[i].LastScreen()->GetBusAliases() )
-            m_bus_alias_cache[ alias->GetName() ] = alias;
+        for( const std::shared_ptr<BUS_ALIAS>& alias : screen->GetBusAliases() )
+            m_bus_alias_cache[alias->GetName()] = alias;
    }

    PROF_TIMER sub_graph( "buildItemSubGraphs" );
@@ -2154,18 +2159,19 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
                    if( !secondary_is_global && candidate->m_sheet != subgraph->m_sheet )
                        continue;

-                    SCH_CONNECTION* conn = candidate->m_driver_connection;
-
-                    if( conn->Name() == secondary_name )
+                    for( SCH_ITEM* candidate_driver : candidate->m_drivers )
                    {
-                        wxLogTrace( ConnTrace, wxS( "Global %lu (%s) promoted to %s" ),
-                                    candidate->m_code, conn->Name(),
-                                    subgraph->m_driver_connection->Name() );
+                        if( candidate->GetNameForDriver( candidate_driver ) == secondary_name )
+                        {
+                            wxLogTrace( ConnTrace, wxS( "Global %lu (%s) promoted to %s" ),
+                                        candidate->m_code, candidate->m_driver_connection->Name(),
+                                        subgraph->m_driver_connection->Name() );

-                        conn->Clone( *subgraph->m_driver_connection );
+                            candidate->m_driver_connection->Clone( *subgraph->m_driver_connection );

-                        candidate->m_dirty = false;
-                        propagateToNeighbors( candidate, false );
+                            candidate->m_dirty = false;
+                            propagateToNeighbors( candidate, false );
+                        }
                    }
                }
            }
@@ -2197,7 +2203,7 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
    for( CONNECTION_SUBGRAPH* subgraph : m_driver_subgraphs )
    {
        // All SGs should have been processed by propagateToNeighbors above
-        wxASSERT_MSG( !subgraph->m_dirty,
+        wxCHECK2_MSG( !subgraph->m_dirty, continue,
                      wxS( "Subgraph not processed by propagateToNeighbors!" ) );

        if( subgraph->m_bus_parents.size() < 2 )
@@ -2208,7 +2214,7 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
        wxLogTrace( ConnTrace, wxS( "%lu (%s) has multiple bus parents" ),
                    subgraph->m_code, conn->Name() );

-        wxASSERT( conn->IsNet() );
+        wxCHECK2( conn->IsNet(), continue );

        for( const auto& ii : subgraph->m_bus_parents )
        {
@@ -2574,7 +2580,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                        candidate->m_hier_parent = aParent;
                        aParent->m_hier_children.insert( candidate );

-                        wxASSERT( candidate->m_graph == aParent->m_graph );
+                        wxCHECK2( candidate->m_graph == aParent->m_graph, continue );

                        search_list.push_back( candidate );
                        break;
@@ -2692,7 +2698,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                    continue;

                // Safety check against infinite recursion
-                wxASSERT( neighbor_conn->IsNet() );
+                wxCHECK2( neighbor_conn->IsNet(), continue );

                wxLogTrace( ConnTrace, wxS( "%lu (%s) connected to bus member %s (local %s)" ),
                            neighbor->m_code, neighbor_name, member->Name(), member->LocalName() );
@@ -2902,7 +2908,7 @@ std::shared_ptr<SCH_CONNECTION> CONNECTION_GRAPH::getDefaultConnection( SCH_ITEM
 SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection,
                                                  SCH_CONNECTION* aSearch )
 {
-    wxASSERT( aBusConnection->IsBus() );
+    wxCHECK( aBusConnection->IsBus(), nullptr );

    SCH_CONNECTION* match = nullptr;

@@ -2984,7 +2990,7 @@ std::vector<const CONNECTION_SUBGRAPH*> CONNECTION_GRAPH::GetBusesNeedingMigrati
    for( CONNECTION_SUBGRAPH* subgraph : m_subgraphs )
    {
        // Graph is supposed to be up-to-date before calling this
-        wxASSERT( !subgraph->m_dirty );
+        wxCHECK2( !subgraph->m_dirty, continue );

        if( !subgraph->m_driver )
            continue;
@@ -3062,7 +3068,7 @@ CONNECTION_SUBGRAPH* CONNECTION_GRAPH::FindSubgraphByName( const wxString& aNetN
    for( CONNECTION_SUBGRAPH* sg : it->second )
    {
        // Cache is supposed to be valid by now
-        wxASSERT( sg && !sg->m_absorbed && sg->m_driver_connection );
+        wxCHECK2( sg && !sg->m_absorbed && sg->m_driver_connection, continue );

        if( sg->m_sheet == aPath && sg->m_driver_connection->Name() == aNetName )
            return sg;
@@ -3079,7 +3085,7 @@ CONNECTION_SUBGRAPH* CONNECTION_GRAPH::FindFirstSubgraphByName( const wxString&
    if( it == m_net_name_to_subgraphs_map.end() )
        return nullptr;

-    wxASSERT( !it->second.empty() );
+    wxCHECK( !it->second.empty(), nullptr );

    return it->second[0];
 }
@@ -3129,7 +3135,7 @@ int CONNECTION_GRAPH::RunERC()
        wxCHECK2( subgraph, continue );

        // Graph is supposed to be up-to-date before calling RunERC()
-        wxASSERT( !subgraph->m_dirty );
+        wxCHECK2( !subgraph->m_dirty, continue );

        if( subgraph->m_absorbed )
            continue;
@@ -466,6 +466,18 @@ public:
    */
    void ExchangeItem( SCH_ITEM* aOldItem, SCH_ITEM* aNewItem );

+    /**
+     * We modify how we handle the connectivity graph for small graphs vs large
+     * graphs.  Partially this is to avoid unneeded complexity for small graphs,
+     * where the performance of the graph is not a concern.  This is considered
+     * a temporary solution until the connectivity graph is refactored with an
+     * eye toward partial updates
+    */
+    bool IsMinor() const
+    {
+        return m_items.size() < 10000;
+    }
+
 private:
    /**
     * Update the graphical connectivity between items (i.e. where they touch)
@@ -885,12 +885,16 @@ void DIALOG_ERC::OnSeverity( wxCommandEvent& aEvent )
 void DIALOG_ERC::deleteAllMarkers( bool aIncludeExclusions )
 {
    // Clear current selection list to avoid selection of deleted items
+    // Freeze to avoid repainting the dialog, which can cause a RePaint()
+    // of the screen as well
+    Freeze();
    m_parent->GetToolManager()->RunAction( EE_ACTIONS::clearSelection );

    m_markerTreeModel->DeleteItems( false, aIncludeExclusions, false );

    SCH_SCREENS screens( m_parent->Schematic().Root() );
    screens.DeleteAllMarkers( MARKER_BASE::MARKER_ERC, aIncludeExclusions );
+    Thaw();
 }


@@ -352,6 +352,8 @@ bool DIALOG_SHEET_PROPERTIES::TransferDataFromWindow()
        {
            if( clearFileName )
                currentScreen->SetFileName( wxEmptyString );
+            else
+                m_fields->at( SHEETFILENAME ).SetText( oldFilename );

            return false;
        }
@@ -434,7 +436,7 @@ bool DIALOG_SHEET_PROPERTIES::TransferDataFromWindow()
    for( SCH_ITEM* item : m_frame->GetScreen()->Items().OfType( SCH_SHEET_T ) )
        m_frame->UpdateItem( item );

-    if( isUndoable )
+    if( isUndoable && !m_sheet->IsNew() )
    {
        commit.Push( _( "Edit Sheet Properties" ) );
    }
@@ -561,6 +563,7 @@ bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilena
            if( useScreen || loadFromFile )           // Load from existing file.
            {
                clearAnnotation = true;
+                oldScreen = m_sheet->GetScreen();

                if( !IsOK( this, wxString::Format( _( "Change '%s' link from '%s' to '%s'?" ),
                                                   newAbsoluteFilename,
@@ -461,7 +461,7 @@ void DIALOG_SIM_MODEL<T_symbol, T_field>::updateWidgets()
    updateBuiltinModelWidgets( model );
    updateModelParamsTab( model );
    updateModelCodeTab( model );
-    updatePinAssignments( model, false );
+    updatePinAssignments( model, model != m_prevModel );

    std::string ref = SIM_MODEL::GetFieldValue( &m_fields, SIM_REFERENCE_FIELD );

@@ -836,12 +836,26 @@ bool DIALOG_SIM_MODEL<T_symbol, T_field>::loadLibrary( const wxString& aLibraryP

    wxArrayString modelNames;

+    bool modelNameExists = false;
+
    for( const auto& [name, model] : library()->GetModels() )
+    {
        modelNames.Add( name );

+        if( name == modelName )
+            modelNameExists = true;
+    }
+
    m_modelNameChoice->Clear();
    m_modelNameChoice->Append( modelNames );

+    if( !modelNameExists )
+    {
+        m_infoBar->ShowMessage(
+                wxString::Format( _( "No model named '%s' in '%s'." ), modelName, aLibraryPath ) );
+        return false;
+    }
+
    if( isIbisLoaded() )
    {
        wxArrayString emptyArray;
@@ -471,6 +471,27 @@ bool DIALOG_SYMBOL_REMAP::backupProject( REPORTER& aReporter )
            errorMsg += tmp;
        }

+        // Back up the old (2007) cache library.
+        srcFileName.SetPath( Prj().GetProjectPath() );
+        srcFileName.SetName( Prj().GetProjectName() + wxS( ".cache" ) );
+        srcFileName.SetExt( FILEEXT::LegacySymbolLibFileExtension );
+
+        destFileName = srcFileName;
+        destFileName.SetName( destFileName.GetName() + timeStamp );
+        destFileName.AppendDir( backupFolder );
+
+        aReporter.Report( wxString::Format( _( "Backing up file '%s' to '%s'." ),
+                                            srcFileName.GetFullPath(),
+                                            destFileName.GetFullPath() ),
+                          RPT_SEVERITY_INFO );
+
+        if( srcFileName.Exists()
+                && !wxCopyFile( srcFileName.GetFullPath(), destFileName.GetFullPath() ) )
+        {
+            errorMsg += wxString::Format( _( "Failed to back up file '%s'.\n" ),
+                                          srcFileName.GetFullPath() );
+        }
+
        // Back up the rescue symbol library if it exists.
        srcFileName.SetName( Prj().GetProjectName() + wxS( "-rescue" ) );
        destFileName.SetName( srcFileName.GetName() + timeStamp );
@@ -1255,7 +1255,9 @@ bool SCH_EDIT_FRAME::SaveProject( bool aSaveAs )

            wxCHECK2( screen, continue );

-            sheets.emplace_back( std::make_pair( screen->GetUuid(), sheet->GetName() ) );
+            // For the root sheet we use the canonical name ( "Root" ) because its name
+            // cannot be modified by the user
+            sheets.emplace_back( std::make_pair( screen->GetUuid(), wxT( "Root" ) ) );
        }
        else
        {
@@ -139,5 +139,4 @@ private:
                const TRANSFORM& aTransform, bool aDimmed ) override;
 };

-
 #endif    // LIB_SHAPE_H
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 1992-2018 jp.charras at wanadoo.fr
 * Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2023, 2024 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -23,6 +23,9 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

+#include <algorithm>
+#include <vector>
+
 #include <confirm.h>
 #include <refdes_utils.h>

@@ -68,8 +71,23 @@ bool NETLIST_EXPORTER_ORCADPCB2::WriteNetlist( const wxString& aOutFileName,
    {
        SCH_SHEET_PATH sheet = sheetList[i];

-        // Process symbol attributes
+        // The rtree returns items in a non-deterministic order (platform-dependent)
+        // Therefore we need to sort them before outputting to ensure file stability for version
+        // control and QA comparisons
+        std::vector<EDA_ITEM*> sheetItems;
+
        for( EDA_ITEM* item : sheet.LastScreen()->Items().OfType( SCH_SYMBOL_T ) )
+            sheetItems.push_back( item );
+
+        auto pred = []( const EDA_ITEM* item1, const EDA_ITEM* item2 )
+        {
+            return item1->m_Uuid < item2->m_Uuid;
+        };
+
+        std::sort( sheetItems.begin(), sheetItems.end(), pred );
+
+        // Process symbol attributes
+        for( EDA_ITEM* item : sheetItems )
        {
            SCH_SYMBOL* symbol = findNextSymbol( item, &sheet );

@@ -94,6 +94,7 @@
 #include <wx/socket.h>
 #include <widgets/wx_aui_utils.h>
 #include <drawing_sheet/ds_proxy_view_item.h>
+#include <project/project_local_settings.h>


 #define DIFF_SYMBOLS_DIALOG_NAME wxT( "DiffSymbolsDialog" )
@@ -1111,6 +1112,7 @@ void SCH_EDIT_FRAME::OnUpdatePCB( wxCommandEvent& event )
    }

    KIWAY_PLAYER* frame = Kiway().Player( FRAME_PCB_EDITOR, false );
+    wxEventBlocker blocker( this );

    if( !frame )
    {
@@ -1338,6 +1340,7 @@ void SCH_EDIT_FRAME::OnOpenPcbnew( wxCommandEvent& event )
        }
        else
        {
+            wxEventBlocker blocker(this);
            KIWAY_PLAYER* frame = Kiway().Player( FRAME_PCB_EDITOR, false );

            if( !frame )
@@ -1679,9 +1682,7 @@ void SCH_EDIT_FRAME::RecalculateConnections( SCH_COMMIT* aCommit, SCH_CLEANUP_FL
    if( !aCommit )
        aCommit = &localCommit;

-#ifdef PROFILE
    PROF_TIMER timer;
-#endif

    // Ensure schematic graph is accurate
    if( aCleanupFlags == LOCAL_CLEANUP )
@@ -1694,10 +1695,8 @@ void SCH_EDIT_FRAME::RecalculateConnections( SCH_COMMIT* aCommit, SCH_CLEANUP_FL
            SchematicCleanUp( aCommit, sheet.LastScreen() );
    }

-#ifdef PROFILE
    timer.Stop();
    wxLogTrace( "CONN_PROFILE", "SchematicCleanUp() %0.4f ms", timer.msecs() );
-#endif

    if( settings.m_IntersheetRefsShow )
        RecomputeIntersheetRefs();
@@ -1714,7 +1713,7 @@ void SCH_EDIT_FRAME::RecalculateConnections( SCH_COMMIT* aCommit, SCH_CLEANUP_FL
            };

    if( !ADVANCED_CFG::GetCfg().m_IncrementalConnectivity || aCleanupFlags == GLOBAL_CLEANUP
-            || m_undoList.m_CommandsList.empty() )
+            || m_undoList.m_CommandsList.empty()|| Schematic().ConnectionGraph()->IsMinor() )
    {
        Schematic().ConnectionGraph()->Recalculate( list, true, &changeHandler );
    }
@@ -32,6 +32,8 @@

 #include <wx/log.h>
 #include <wx/menu.h>
+
+#include <advanced_config.h>
 #include <base_units.h>
 #include <common.h>     // for ExpandTextVars
 #include <eda_item.h>
@@ -238,21 +240,25 @@ wxString SCH_FIELD::GetShownText( const SCH_SHEET_PATH* aPath, bool aAllowExtraT
        text = wxS( "" );
    }

-    for( int ii = 0; ii < 10 && text.Contains( wxT( "${" ) ); ++ii )
+    // The iteration here it to allow for nested variables in the
+    // text strings (e.g. ${${VAR}}).  Although the symbols and sheets
+    // and labels recurse, text that is none of those types such as text
+    // boxes and labels do not.  This only loops if there is still a
+    // variable to resolve.
+    for( int ii = aDepth;
+         ii < ADVANCED_CFG::GetCfg().m_ResolveTextRecursionDepth && text.Contains( wxT( "${" ) );
+         ++ii )
    {
-        if( aDepth < 10 )
+        if( m_parent && m_parent->Type() == SCH_SYMBOL_T )
+            text = ExpandTextVars( text, &symbolResolver );
+        else if( m_parent && m_parent->Type() == SCH_SHEET_T )
+            text = ExpandTextVars( text, &sheetResolver );
+        else if( m_parent && m_parent->IsType( { SCH_LABEL_LOCATE_ANY_T } ) )
+            text = ExpandTextVars( text, &labelResolver );
+        else if( Schematic() )
        {
-            if( m_parent && m_parent->Type() == SCH_SYMBOL_T )
-                text = ExpandTextVars( text, &symbolResolver );
-            else if( m_parent && m_parent->Type() == SCH_SHEET_T )
-                text = ExpandTextVars( text, &sheetResolver );
-            else if( m_parent && m_parent->IsType( { SCH_LABEL_LOCATE_ANY_T } ) )
-                text = ExpandTextVars( text, &labelResolver );
-            else if( Schematic() )
-            {
-                text = ExpandTextVars( text, &Schematic()->Prj() );
-                text = ExpandTextVars( text, &schematicResolver );
-            }
+            text = ExpandTextVars( text, &Schematic()->Prj() );
+            text = ExpandTextVars( text, &schematicResolver );
        }
    }

@@ -92,6 +92,9 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString&        aFi
        SCH_SCREEN* screen = new SCH_SCREEN( aSchematic );
        screen->SetFileName( aFileName );
        rootSheet->SetScreen( screen );
+
+        // Virtual root sheet UUID must be the same as the schematic file UUID.
+        const_cast<KIID&>( rootSheet->m_Uuid ) = screen->GetUuid();
    }

    CADSTAR_SCH_ARCHIVE_LOADER csaLoader( aFileName, m_reporter, m_progressReporter );
@@ -343,19 +343,19 @@ void SCH_IO_DATABASE::connect()
        {
            std::set<std::string> columns;

-            columns.insert( tableIter.key_col );
-            columns.insert( tableIter.footprints_col );
-            columns.insert( tableIter.symbols_col );
+            columns.insert( boost::to_lower_copy( tableIter.key_col ) );
+            columns.insert( boost::to_lower_copy( tableIter.footprints_col ) );
+            columns.insert( boost::to_lower_copy( tableIter.symbols_col ) );

-            columns.insert( tableIter.properties.description );
-            columns.insert( tableIter.properties.footprint_filters );
-            columns.insert( tableIter.properties.keywords );
-            columns.insert( tableIter.properties.exclude_from_sim );
-            columns.insert( tableIter.properties.exclude_from_bom );
-            columns.insert( tableIter.properties.exclude_from_board );
+            columns.insert( boost::to_lower_copy( tableIter.properties.description ) );
+            columns.insert( boost::to_lower_copy( tableIter.properties.footprint_filters ) );
+            columns.insert( boost::to_lower_copy( tableIter.properties.keywords ) );
+            columns.insert( boost::to_lower_copy( tableIter.properties.exclude_from_sim ) );
+            columns.insert( boost::to_lower_copy( tableIter.properties.exclude_from_bom ) );
+            columns.insert( boost::to_lower_copy( tableIter.properties.exclude_from_board ) );

            for( const DATABASE_FIELD_MAPPING& field : tableIter.fields )
-                columns.insert( field.column );
+                columns.insert( boost::to_lower_copy( field.column ) );

            m_conn->CacheTableInfo( tableIter.table, columns );
        }
@@ -220,12 +220,22 @@ void SCH_IO_EAGLE::loadLayerDefs( wxXmlNode* aLayers )
         * </layers>
         */

-        if( elayer.name == wxT( "Nets" ) )
+        switch ( elayer.number)
+        {
+        case 91:
            m_layerMap[elayer.number] = LAYER_WIRE;
-        else if( elayer.name == wxT( "Info" ) || elayer.name == wxT( "Guide" ) )
-            m_layerMap[elayer.number] = LAYER_NOTES;
-        else if( elayer.name == wxT( "Busses" ) )
+            break;
+        case 92:
            m_layerMap[elayer.number] = LAYER_BUS;
+            break;
+        case 97:
+        case 98:
+            m_layerMap[elayer.number] = LAYER_NOTES;
+            break;
+
+        default:
+            break;
+        }
    }
 }

@@ -2903,7 +2913,7 @@ bool SCH_IO_EAGLE::checkHeader( const wxString& aFileName ) const

    wxTextInputStream text( input );

-    for( int i = 0; i < 4; i++ )
+    for( int i = 0; i < 8; i++ )
    {
        if( input.Eof() )
            return false;
@@ -944,16 +944,16 @@ LIB_SYMBOL* SCH_EASYEDA_PARSER::ParseSymbol( const VECTOR2D&              aOrigi
    std::optional<wxString> valOpt;
    wxString                symbolName = wxS( "Unknown" );

-    if( valOpt = get_opt( aParams, wxS( "name" ) ) )
+    if( ( valOpt = get_opt( aParams, wxS( "name" ) ) ) )
        symbolName = *valOpt;
-    else if( valOpt = get_opt( aParams, wxS( "spiceSymbolName" ) ) )
+    else if( ( valOpt = get_opt( aParams, wxS( "spiceSymbolName" ) ) ) )
        symbolName = *valOpt;

    wxString symbolPrefix;

-    if( valOpt = get_opt( aParams, wxS( "pre" ) ) )
+    if( ( valOpt = get_opt( aParams, wxS( "pre" ) ) ) )
        symbolPrefix = *valOpt;
-    else if( valOpt = get_opt( aParams, wxS( "spicePre" ) ) )
+    else if( ( valOpt = get_opt( aParams, wxS( "spicePre" ) ) ) )
        symbolPrefix = *valOpt;

    LIB_ID libId = EasyEdaToKiCadLibID( wxEmptyString, symbolName );
@@ -971,7 +971,7 @@ LIB_SYMBOL* SCH_EASYEDA_PARSER::ParseSymbol( const VECTOR2D&              aOrigi
        if( srcName == wxS( "Datasheet" ) )
            srcName = wxS( "link" );

-        if( valOpt = get_opt( aParams, srcName ) )
+        if( ( valOpt = get_opt( aParams, srcName ) ) )
        {
            if( valOpt->empty() )
                continue;
@@ -640,6 +640,9 @@ SCH_SHEET* SCH_IO_EASYEDA::LoadSchematicFile( const wxString& aFileName, SCHEMAT

        screen->SetFileName( aFileName );
        rootSheet->SetScreen( screen );
+
+        // Virtual root sheet UUID must be the same as the schematic file UUID.
+        const_cast<KIID&>( rootSheet->m_Uuid ) = screen->GetUuid();
    }

    SYMBOL_LIB_TABLE* libTable = PROJECT_SCH::SchSymbolLibTable( &aSchematic->Prj() );
@@ -552,7 +552,7 @@ SCH_EASYEDAPRO_PARSER::ParseSymbol( const std::vector<nlohmann::json>&  aLines,
        else if( type == wxS( "TEXT" ) )
        {
            VECTOR2D pos( line.at( 2 ), line.at( 3 ) );
-            double   angle = line.at( 4 );
+            double   angle = line.at( 4 ).is_number() ? line.at( 4 ).get<double>() : 0.0;
            wxString textStr = line.at( 5 );
            wxString fontStyleStr = line.at( 6 );

@@ -960,7 +960,7 @@ void SCH_EASYEDAPRO_PARSER::ParseSchematic( SCHEMATIC* aSchematic, SCH_SHEET* aR
        else if( type == wxS( "TEXT" ) )
        {
            VECTOR2D pos( line.at( 2 ), line.at( 3 ) );
-            double   angle = line.at( 4 );
+            double   angle = line.at( 4 ).is_number() ? line.at( 4 ).get<double>() : 0.0;
            wxString textStr = line.at( 5 );
            wxString fontStyleStr = line.at( 6 );

@@ -455,6 +455,9 @@ SCH_SHEET* SCH_IO_EASYEDAPRO::LoadSchematicFile( const wxString& aFileName,

        screen->SetFileName( aFileName );
        rootSheet->SetScreen( screen );
+        
+        // Virtual root sheet UUID must be the same as the schematic file UUID.
+        const_cast<KIID&>( rootSheet->m_Uuid ) = screen->GetUuid();
    }

    SYMBOL_LIB_TABLE* libTable = PROJECT_SCH::SchSymbolLibTable( &aSchematic->Prj() );
@@ -29,8 +29,7 @@
 #include "sch_io_http_lib.h"


-SCH_IO_HTTP_LIB::SCH_IO_HTTP_LIB() : SCH_IO( wxS( "HTTP library" ) ),
-    m_libTable( nullptr )
+SCH_IO_HTTP_LIB::SCH_IO_HTTP_LIB() : SCH_IO( wxS( "HTTP library" ) ), m_libTable( nullptr )
 {
 }

@@ -56,11 +55,11 @@ void SCH_IO_HTTP_LIB::EnumerateSymbolLib( std::vector<LIB_SYMBOL*>& aSymbolList,
                                          const wxString&           aLibraryPath,
                                          const STRING_UTF8_MAP*    aProperties )
 {
-    wxCHECK_RET( m_libTable, _("httplib plugin missing library table handle!") );
+    wxCHECK_RET( m_libTable, _( "httplib plugin missing library table handle!" ) );
    ensureSettings( aLibraryPath );
    ensureConnection();

-    if( !m_conn)
+    if( !m_conn )
    {
        THROW_IO_ERROR( m_lastError );
        return;
@@ -70,13 +69,11 @@ void SCH_IO_HTTP_LIB::EnumerateSymbolLib( std::vector<LIB_SYMBOL*>& aSymbolList,
            ( aProperties
              && aProperties->find( SYMBOL_LIB_TABLE::PropPowerSymsOnly ) != aProperties->end() );

-    for(const HTTP_LIB_CATEGORY& category : m_conn->getCategories() )
+    for( const HTTP_LIB_CATEGORY& category : m_conn->getCategories() )
    {
        bool refresh_cache = true;

-        std::vector<HTTP_LIB_PART> found_parts;
-
-         // Check if there is already a part in our cache, if not fetch it
+        // Check if there is already a part in our cache, if not fetch it
        if( m_cachedCategories.find( category.id ) != m_cachedCategories.end() )
        {
            // check if it's outdated, if so re-fetch
@@ -89,26 +86,7 @@ void SCH_IO_HTTP_LIB::EnumerateSymbolLib( std::vector<LIB_SYMBOL*>& aSymbolList,

        if( refresh_cache )
        {
-            if( !m_conn->SelectAll( category, found_parts ) )
-            {
-                if( !m_conn->GetLastError().empty() )
-                {
-                    wxString msg =
-                            wxString::Format( _( "Error retriving data from HTTP library %s: %s" ),
-                                              category.name, m_conn->GetLastError() );
-                    THROW_IO_ERROR( msg );
-                }
-
-                continue;
-            }
-
-            // remove cached parts
-            m_cachedCategories[category.id].cachedParts.clear();
-
-            // Copy newly cached data across
-            m_cachedCategories[category.id].cachedParts = found_parts;
-            m_cachedCategories[category.id].lastCached = std::time( nullptr );
-
+            syncCache( category );
        }

        for( const HTTP_LIB_PART& part : m_cachedCategories[category.id].cachedParts )
@@ -119,14 +97,12 @@ void SCH_IO_HTTP_LIB::EnumerateSymbolLib( std::vector<LIB_SYMBOL*>& aSymbolList,

            if( symbol && ( !powerSymbolsOnly || symbol->IsPower() ) )
                aSymbolList.emplace_back( symbol );
-
        }
    }
 }


-LIB_SYMBOL* SCH_IO_HTTP_LIB::LoadSymbol( const wxString&        aLibraryPath,
-                                         const wxString&        aAliasName,
+LIB_SYMBOL* SCH_IO_HTTP_LIB::LoadSymbol( const wxString& aLibraryPath, const wxString& aAliasName,
                                         const STRING_UTF8_MAP* aProperties )
 {
    wxCHECK( m_libTable, nullptr );
@@ -145,13 +121,17 @@ LIB_SYMBOL* SCH_IO_HTTP_LIB::LoadSymbol( const wxString&        aLibraryPath,

    std::vector<HTTP_LIB_CATEGORY> categories = m_conn->getCategories();

-    std::tuple relations = m_conn->getCachedParts()[partName];
+    if( m_conn->getCachedParts().empty() )
+    {
+        syncCache();
+    }
+
+    std::tuple  relations = m_conn->getCachedParts()[partName];
+    std::string associatedCatID = std::get<1>( relations );

    // get the matching category
    for( const HTTP_LIB_CATEGORY& categoryIter : categories )
    {
-        std::string associatedCatID = std::get<1>( relations );
-
        if( categoryIter.id == associatedCatID )
        {
            foundCategory = &categoryIter;
@@ -197,26 +177,30 @@ LIB_SYMBOL* SCH_IO_HTTP_LIB::LoadSymbol( const wxString&        aLibraryPath,

 void SCH_IO_HTTP_LIB::GetSubLibraryNames( std::vector<wxString>& aNames )
 {
-     ensureSettings( wxEmptyString );
+    ensureSettings( wxEmptyString );

-     aNames.clear();
+    aNames.clear();

-     std::set<wxString> categoryNames;
+    std::set<wxString> categoryNames;

-     for( const HTTP_LIB_CATEGORY& categoryIter : m_conn->getCategories() )
-     {
+    for( const HTTP_LIB_CATEGORY& categoryIter : m_conn->getCategories() )
+    {
        if( categoryNames.count( categoryIter.name ) )
            continue;

        aNames.emplace_back( categoryIter.name );
        categoryNames.insert( categoryIter.name );
-     }
+    }
 }

+wxString SCH_IO_HTTP_LIB::GetSubLibraryDescription( const wxString& aName )
+{
+    return m_conn->getCategoryDescription( std::string( aName.mb_str() ) );
+}

 void SCH_IO_HTTP_LIB::GetAvailableSymbolFields( std::vector<wxString>& aNames )
 {
-     // TODO: Implement this sometime; This is currently broken...
+    // TODO: Implement this sometime; This is currently broken...
    std::copy( m_customFields.begin(), m_customFields.end(), std::back_inserter( aNames ) );
 }

@@ -230,13 +214,12 @@ void SCH_IO_HTTP_LIB::GetDefaultSymbolFields( std::vector<wxString>& aNames )

 void SCH_IO_HTTP_LIB::ensureSettings( const wxString& aSettingsPath )
 {
-
    auto tryLoad = [&]()
    {
        if( !m_settings->LoadFromFile() )
        {
-            wxString msg = wxString::Format( _( "HTTP library settings file %s missing or invalid" ),
-                                             aSettingsPath );
+            wxString msg = wxString::Format(
+                    _( "HTTP library settings file %s missing or invalid" ), aSettingsPath );

            THROW_IO_ERROR( msg );
        }
@@ -252,11 +235,10 @@ void SCH_IO_HTTP_LIB::ensureSettings( const wxString& aSettingsPath )

        if( m_settings->getSupportedAPIVersion() != m_settings->m_Source.api_version )
        {
-            wxString msg = wxString::Format(
-                    _( "HTTP library settings file %s uses API version %s, but KiCad requires version %s" ),
-                    aSettingsPath,
-                    m_settings->m_Source.api_version,
-                    m_settings->getSupportedAPIVersion() );
+            wxString msg = wxString::Format( _( "HTTP library settings file %s uses API version "
+                                                "%s, but KiCad requires version %s" ),
+                                             aSettingsPath, m_settings->m_Source.api_version,
+                                             m_settings->getSupportedAPIVersion() );

            THROW_IO_ERROR( msg );
        }
@@ -264,8 +246,7 @@ void SCH_IO_HTTP_LIB::ensureSettings( const wxString& aSettingsPath )
        if( m_settings->m_Source.root_url.empty() )
        {
            wxString msg = wxString::Format(
-                    _( "HTTP library settings file %s is missing the root URL!" ),
-                    aSettingsPath );
+                    _( "HTTP library settings file %s is missing the root URL!" ), aSettingsPath );

            THROW_IO_ERROR( msg );
        }
@@ -290,7 +271,6 @@ void SCH_IO_HTTP_LIB::ensureSettings( const wxString& aSettingsPath )

        // Append api version to root URL
        m_settings->m_Source.root_url += m_settings->m_Source.api_version + "/";
-
    };

    if( !m_settings && !aSettingsPath.IsEmpty() )
@@ -322,9 +302,8 @@ void SCH_IO_HTTP_LIB::ensureConnection()

    if( !m_conn || !m_conn->IsValidEndpoint() )
    {
-        wxString msg = wxString::Format(
-                _( "Could not connect to %s. Errors: %s" ),
-                m_settings->m_Source.root_url, m_lastError );
+        wxString msg = wxString::Format( _( "Could not connect to %s. Errors: %s" ),
+                                         m_settings->m_Source.root_url, m_lastError );

        THROW_IO_ERROR( msg );
    }
@@ -351,6 +330,38 @@ void SCH_IO_HTTP_LIB::connect()
    }
 }

+void SCH_IO_HTTP_LIB::syncCache()
+{
+    for( const HTTP_LIB_CATEGORY& category : m_conn->getCategories() )
+    {
+        syncCache( category );
+    }
+}
+
+void SCH_IO_HTTP_LIB::syncCache( const HTTP_LIB_CATEGORY& category )
+{
+    std::vector<HTTP_LIB_PART> found_parts;
+
+    if( !m_conn->SelectAll( category, found_parts ) )
+    {
+        if( !m_conn->GetLastError().empty() )
+        {
+            wxString msg = wxString::Format( _( "Error retriving data from HTTP library %s: %s" ),
+                                             category.name, m_conn->GetLastError() );
+            THROW_IO_ERROR( msg );
+        }
+
+        return;
+    }
+
+    // remove cached parts
+    m_cachedCategories[category.id].cachedParts.clear();
+
+    // Copy newly cached data across
+    m_cachedCategories[category.id].cachedParts = found_parts;
+    m_cachedCategories[category.id].lastCached = std::time( nullptr );
+}
+

 LIB_SYMBOL* SCH_IO_HTTP_LIB::loadSymbolFromPart( const wxString&          aSymbolName,
                                                 const HTTP_LIB_CATEGORY& aCategory,
@@ -478,7 +489,6 @@ LIB_SYMBOL* SCH_IO_HTTP_LIB::loadSymbolFromPart( const wxString&          aSymbo

                m_customFields.insert( fieldName );
            }
-
        }
    }

@@ -62,6 +62,8 @@ public:

    void GetSubLibraryNames( std::vector<wxString>& aNames ) override;

+    wxString GetSubLibraryDescription( const wxString& aName ) override;
+
    void GetAvailableSymbolFields( std::vector<wxString>& aNames ) override;

    void GetDefaultSymbolFields( std::vector<wxString>& aNames ) override;
@@ -78,20 +80,22 @@ public:
    const wxString& GetError() const override { return m_lastError; }

 private:
-
    void ensureSettings( const wxString& aSettingsPath );

    void ensureConnection();

    void connect();

-    LIB_SYMBOL* loadSymbolFromPart( const wxString& aSymbolName,
-                                    const HTTP_LIB_CATEGORY& aCategory,
+    void syncCache();
+
+    void syncCache( const HTTP_LIB_CATEGORY& category );
+
+    LIB_SYMBOL* loadSymbolFromPart( const wxString& aSymbolName, const HTTP_LIB_CATEGORY& aCategory,
                                    const HTTP_LIB_PART& aPart );

    SYMBOL_LIB_TABLE* m_libTable;

-     /// Generally will be null if no valid connection is established
+    /// Generally will be null if no valid connection is established
    std::unique_ptr<HTTP_LIB_CONNECTION> m_conn;

    std::unique_ptr<HTTP_LIB_SETTINGS> m_settings;
@@ -110,9 +114,8 @@ private:
    wxString datasheet_field = "datasheet";
    wxString reference_field = "reference";

-     //     category.id       category
+    //     category.id       category
    std::map<std::string, HTTP_LIB_CATEGORY> m_cachedCategories;
-
 };

 #endif // SCH_IO_HTTP_LIB_H_
@@ -1159,11 +1159,16 @@ LIB_PIN* SCH_IO_KICAD_LEGACY_LIB_CACHE::loadPin( std::unique_ptr<LIB_SYMBOL>& aS

    pos += tmp.size() + 1;

-    PIN_ORIENTATION orientation = PIN_ORIENTATION::PIN_RIGHT;
-    std::optional<PIN_ORIENTATION> optVal = magic_enum::enum_cast<PIN_ORIENTATION>( tmp[0] );
+    PIN_ORIENTATION orientation;

-    if( optVal.has_value() )
-        orientation = optVal.value();
+    switch( static_cast<char>( tmp[0] ) )
+    {
+    case 'U': orientation = PIN_ORIENTATION::PIN_UP; break;
+    case 'D': orientation = PIN_ORIENTATION::PIN_DOWN; break;
+    case 'L': orientation = PIN_ORIENTATION::PIN_LEFT; break;
+    case 'R': /* fall-through */
+    default:  orientation = PIN_ORIENTATION::PIN_RIGHT; break;
+    }

    tmp = tokens.GetNextToken();

@@ -1331,7 +1331,7 @@ void SCH_IO_KICAD_SEXPR::saveText( SCH_TEXT* aText, int aNestLevel )
                      EDA_UNIT_UTILS::FormatAngle( angle ).c_str() );
    }

-    if( aText->GetFieldsAutoplaced() != FIELDS_AUTOPLACED_NO )
+    if( label && !label->GetFields().empty() && label->GetFieldsAutoplaced() != FIELDS_AUTOPLACED_NO )
        m_out->Print( 0, " (fields_autoplaced yes)" );

    m_out->Print( 0, "\n" );
@@ -309,29 +309,42 @@ void formatPoly( OUTPUTFORMATTER* aFormatter, int aNestLevel, EDA_SHAPE* aPolyLi
 {
    int newLine = 0;
    int lineCount = 1;
+
    aFormatter->Print( aNestLevel, "(polyline%s\n",
                       aIsPrivate ? " private" : "" );
    aFormatter->Print( aNestLevel + 1, "(pts" );

-    for( const VECTOR2I& pt : aPolyLine->GetPolyShape().Outline( 0 ).CPoints() )
-    {
-        if( newLine == 4 || !ADVANCED_CFG::GetCfg().m_CompactSave )
-        {
-            aFormatter->Print( 0, "\n" );
-            aFormatter->Print( aNestLevel + 2, "(xy %s %s)",
-                               EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.x ).c_str(),
-                               EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.y ).c_str() );
-            newLine = 0;
-            lineCount += 1;
-        }
-        else
-        {
-            aFormatter->Print( 0, " (xy %s %s)",
-                               EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.x ).c_str(),
-                               EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.y ).c_str() );
-        }
+    const SHAPE_POLY_SET& polySet = aPolyLine->GetPolyShape();

-        newLine += 1;
+
+    if( polySet.OutlineCount() == 0 )
+    {
+        // If we've managed to get a polyline with no points, that's probably a bad thing,
+        // but at least don't dereference it and crash.
+        wxFAIL_MSG( "Polyline has no outline" );
+    }
+    else
+    {
+        for( const VECTOR2I& pt : polySet.Outline( 0 ).CPoints() )
+        {
+            if( newLine == 4 || !ADVANCED_CFG::GetCfg().m_CompactSave )
+            {
+                aFormatter->Print( 0, "\n" );
+                aFormatter->Print( aNestLevel + 2, "(xy %s %s)",
+                                EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.x ).c_str(),
+                                EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.y ).c_str() );
+                newLine = 0;
+                lineCount += 1;
+            }
+            else
+            {
+                aFormatter->Print( 0, " (xy %s %s)",
+                                EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.x ).c_str(),
+                                EDA_UNIT_UTILS::FormatInternalUnits( schIUScale, pt.y ).c_str() );
+            }
+
+            newLine += 1;
+        }
    }

    if( lineCount == 1 )
@@ -3578,6 +3578,16 @@ SCH_BUS_WIRE_ENTRY* SCH_IO_KICAD_SEXPR_PARSER::parseBusEntry()
 }


+void fixupSchFillMode( SCH_SHAPE* aShape )
+{
+    if( aShape->GetFillMode() == FILL_T::FILLED_SHAPE )
+    {
+        aShape->SetFillColor( aShape->GetStroke().GetColor() );
+        aShape->SetFillMode( FILL_T::FILLED_WITH_COLOR );
+    }
+}
+
+
 SCH_SHAPE* SCH_IO_KICAD_SEXPR_PARSER::parseSchPolyLine()
 {
    T             token;
@@ -3627,6 +3637,7 @@ SCH_SHAPE* SCH_IO_KICAD_SEXPR_PARSER::parseSchPolyLine()
            parseFill( fill );
            polyline->SetFillMode( fill.m_FillType );
            polyline->SetFillColor( fill.m_Color );
+            fixupSchFillMode( polyline.get() );
            break;

        case T_uuid:
@@ -3759,6 +3770,7 @@ SCH_SHAPE* SCH_IO_KICAD_SEXPR_PARSER::parseSchArc()
            parseFill( fill );
            arc->SetFillMode( fill.m_FillType );
            arc->SetFillColor( fill.m_Color );
+            fixupSchFillMode( arc.get() );
            break;

        case T_uuid:
@@ -3818,6 +3830,7 @@ SCH_SHAPE* SCH_IO_KICAD_SEXPR_PARSER::parseSchCircle()
            parseFill( fill );
            circle->SetFillMode( fill.m_FillType );
            circle->SetFillColor( fill.m_Color );
+            fixupSchFillMode( circle.get() );
            break;

        case T_uuid:
@@ -3876,6 +3889,7 @@ SCH_SHAPE* SCH_IO_KICAD_SEXPR_PARSER::parseSchRectangle()
            parseFill( fill );
            rectangle->SetFillMode( fill.m_FillType );
            rectangle->SetFillColor( fill.m_Color );
+            fixupSchFillMode( rectangle.get() );
            break;

        case T_uuid:
@@ -3949,6 +3963,7 @@ SCH_SHAPE* SCH_IO_KICAD_SEXPR_PARSER::parseSchBezier()
            parseFill( fill );
            bezier->SetFillMode( fill.m_FillType );
            bezier->SetFillColor( fill.m_Color );
+            fixupSchFillMode( bezier.get() );
            break;

        case T_uuid:
@@ -4201,6 +4216,7 @@ SCH_TEXTBOX* SCH_IO_KICAD_SEXPR_PARSER::parseSchTextBox()
            parseFill( fill );
            textBox->SetFillMode( fill.m_FillType );
            textBox->SetFillColor( fill.m_Color );
+            fixupSchFillMode( textBox.get() );
            break;

        case T_effects:
@@ -65,6 +65,9 @@ SCH_SHEET* SCH_IO_LTSPICE::LoadSchematicFile( const wxString& aFileName, SCHEMAT

        screen->SetFileName( aFileName );
        rootSheet->SetScreen( screen );
+
+        // Virtual root sheet UUID must be the same as the schematic file UUID.
+        const_cast<KIID&>( rootSheet->m_Uuid ) = screen->GetUuid();
    }

    SYMBOL_LIB_TABLE* libTable = PROJECT_SCH::SchSymbolLibTable( &aSchematic->Prj() );
@@ -301,6 +301,17 @@ public:
     */
    virtual void GetSubLibraryNames( std::vector<wxString>& aNames ) {}

+    /**
+     * Gets a description of a sublibrary.
+     *
+     * Has no effect if SupportsSubLibraries() returns false.
+     *
+     * @param aName contains the name of the sublibrary for which the description is retrieved
+     *
+     * @return the description of the sublibrary
+     */
+    virtual wxString GetSubLibraryDescription( const wxString& aName ) { return wxEmptyString; }
+
    /**
     * Retrieves a list of (custom) field names that are present on symbols in this library.
     * The plugin is responsible for guaranteeing that this list contains the set of unique
@@ -52,7 +52,7 @@
 /* They are not inline because this creates problems with gcc at linking time in debug mode */

 SCH_ITEM::SCH_ITEM( EDA_ITEM* aParent, KICAD_T aType ) :
-    EDA_ITEM( aParent, aType )
+    EDA_ITEM( aParent, aType, true, false )
 {
    m_layer              = LAYER_WIRE;   // It's only a default, in fact
    m_fieldsAutoplaced   = FIELDS_AUTOPLACED_NO;
@@ -123,6 +123,11 @@ SCH_ITEM* SCH_ITEM::Duplicate( bool doClone ) const

 SCHEMATIC* SCH_ITEM::Schematic() const
 {
+    if( !SCHEMATIC::m_IsSchematicExists )
+    {
+        return nullptr;
+    }
+
    EDA_ITEM* parent = GetParent();

    while( parent )
@@ -23,6 +23,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

+#include <advanced_config.h>
 #include <base_units.h>
 #include <pgm_base.h>
 #include <sch_edit_frame.h>
@@ -903,7 +904,7 @@ wxString SCH_LABEL_BASE::GetShownText( const SCH_SHEET_PATH* aPath, bool aAllowE
    }
    else if( HasTextVars() )
    {
-        if( aDepth < 10 )
+        if( aDepth < ADVANCED_CFG::GetCfg().m_ResolveTextRecursionDepth )
            text = ExpandTextVars( text, &textResolver );
    }

@@ -1313,9 +1314,10 @@ void SCH_LABEL_BASE::Plot( PLOTTER* aPlotter, bool aBackground,
    int              layer = ( connection && connection->IsBus() ) ? LAYER_BUS : m_layer;
    COLOR4D          color = settings->GetLayerColor( layer );
    int              penWidth = GetEffectiveTextPenWidth( settings->GetDefaultPenWidth() );
+    COLOR4D          labelColor = GetLabelColor();

-    if( aPlotter->GetColorMode() && GetTextColor() != COLOR4D::UNSPECIFIED )
-        color = GetTextColor();
+    if( aPlotter->GetColorMode() && labelColor != COLOR4D::UNSPECIFIED )
+        color = labelColor;

    penWidth = std::max( penWidth, settings->GetMinPenWidth() );
    aPlotter->SetCurrentLineWidth( penWidth );
@@ -1412,9 +1414,10 @@ void SCH_LABEL_BASE::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aO
    bool            blackAndWhiteMode = GetGRForceBlackPenState();
    int             penWidth = std::max( GetPenWidth(), aSettings->GetDefaultPenWidth() );
    VECTOR2I        text_offset = aOffset + GetSchematicTextOffset( aSettings );
+    COLOR4D          labelColor = GetLabelColor();

-    if( !blackAndWhiteMode && GetTextColor() != COLOR4D::UNSPECIFIED )
-        color = GetTextColor();
+    if( !blackAndWhiteMode && labelColor != COLOR4D::UNSPECIFIED )
+        color = labelColor;

    EDA_TEXT::Print( aSettings, text_offset, color );

@@ -101,47 +101,6 @@ wxString SCH_LINE::GetFriendlyName() const
 }


-wxString SCH_LINE::GetNetname( const SCH_SHEET_PATH& aSheet )
-{
-    std::list<const SCH_LINE *> checkedLines;
-    checkedLines.push_back(this);
-    return FindWireSegmentNetNameRecursive( this, checkedLines, aSheet );
-}
-
-
-wxString SCH_LINE::FindWireSegmentNetNameRecursive( SCH_LINE *line,
-                                                    std::list<const SCH_LINE *> &checkedLines,
-                                                    const SCH_SHEET_PATH& aSheet ) const
-{
-    for ( auto connected : line->ConnectedItems( aSheet ) )
-    {
-        if( connected->Type() == SCH_LINE_T )
-        {
-            if( std::find(checkedLines.begin(), checkedLines.end(),
-                          connected ) == checkedLines.end() )
-            {
-                SCH_LINE* connectedLine = static_cast<SCH_LINE*>( connected );
-                checkedLines.push_back( connectedLine );
-
-                wxString netName = FindWireSegmentNetNameRecursive( connectedLine, checkedLines,
-                                                                    aSheet );
-
-                if( !netName.IsEmpty() )
-                    return netName;
-            }
-        }
-        else if( connected->Type() == SCH_LABEL_T
-                 || connected->Type() == SCH_GLOBAL_LABEL_T
-                 || connected->Type() == SCH_DIRECTIVE_LABEL_T)
-        {
-            return static_cast<SCH_TEXT*>( connected )->GetText();
-        }
-
-    }
-    return "";
-}
-
-
 EDA_ITEM* SCH_LINE::Clone() const
 {
    return new SCH_LINE( *this );
@@ -63,14 +63,6 @@ public:

    wxString GetFriendlyName() const override;

-    /**
-     * @brief This function travel though all the connected wire segments
-     * to look for connected labels.
-     * @param aSheet - the sheet where the current wire segment is located
-     * @return returns the name of the wire if connected labels found, otherwise empty string
-     */
-    wxString GetNetname(const SCH_SHEET_PATH &aSheet);
-
    bool IsType( const std::vector<KICAD_T>& aScanTypes ) const override
    {
        if( SCH_ITEM::IsType( aScanTypes ) )
@@ -126,7 +126,8 @@ wxString SCH_PIN::GetShownNumber() const

 ELECTRICAL_PINTYPE SCH_PIN::GetType() const
 {
-    wxCHECK( m_libPin, ELECTRICAL_PINTYPE::PT_NC );
+    if( !m_libPin )
+        return ELECTRICAL_PINTYPE::PT_NC;

    if( !m_alt.IsEmpty() )
        return m_libPin->GetAlt( m_alt ).m_Type;
@@ -137,7 +138,8 @@ ELECTRICAL_PINTYPE SCH_PIN::GetType() const

 GRAPHIC_PINSHAPE SCH_PIN::GetShape() const
 {
-    wxCHECK( m_libPin, GRAPHIC_PINSHAPE::LINE );
+    if( !m_libPin )
+        return GRAPHIC_PINSHAPE::LINE;

    if( !m_alt.IsEmpty() )
        return m_libPin->GetAlt( m_alt ).m_Shape;
@@ -148,7 +150,8 @@ GRAPHIC_PINSHAPE SCH_PIN::GetShape() const

 PIN_ORIENTATION SCH_PIN::GetOrientation() const
 {
-    wxCHECK( m_libPin, PIN_ORIENTATION::PIN_RIGHT );
+    if( !m_libPin )
+        return PIN_ORIENTATION::PIN_RIGHT;

    return m_libPin->GetOrientation();
 }
@@ -156,7 +159,8 @@ PIN_ORIENTATION SCH_PIN::GetOrientation() const

 int SCH_PIN::GetLength() const
 {
-    wxCHECK( m_libPin, 0 );
+    if( !m_libPin )
+        return 0;

    return m_libPin->GetLength();
 }
@@ -301,7 +305,8 @@ bool SCH_PIN::IsStacked( const SCH_PIN* aPin ) const

 bool SCH_PIN::IsGlobalPower() const
 {
-    wxCHECK( m_libPin, false );
+    if( !m_libPin )
+        return false;

    return m_libPin->IsGlobalPower();
 }
@@ -425,8 +430,6 @@ const BOX2I SCH_PIN::GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNa
    if( m_libPin )
        r = m_libPin->GetBoundingBox( aIncludeInvisiblePins, aIncludeNameAndNumber,
                                      aIncludeElectricalType );
-    else
-        wxFAIL;

    r.RevertYAxis();

@@ -491,7 +494,8 @@ bool SCH_PIN::HasConnectivityChanges( const SCH_ITEM* aItem,

 bool SCH_PIN::ConnectionPropagatesTo( const EDA_ITEM* aItem ) const
 {
-    wxCHECK( m_libPin, false );
+    if( !m_libPin )
+        return false;

    // Reciprocal checking is done in CONNECTION_GRAPH anyway
    return !( m_libPin->GetType() == ELECTRICAL_PINTYPE::PT_NC );
@@ -511,6 +515,9 @@ bool SCH_PIN::operator==( const SCH_ITEM& aOther ) const
    if( m_position != other.m_position )
        return false;

+    if( !m_libPin )
+        return false;
+
    return m_libPin == other.m_libPin;
 }

@@ -227,8 +227,12 @@ void SCH_PLOTTER::plotOneSheetPDF( PLOTTER* aPlotter, SCH_SCREEN* aScreen,
    if( aPlotSettings.m_useBackgroundColor && aPlotter->GetColorMode() )
    {
        aPlotter->SetColor( aPlotter->RenderSettings()->GetBackgroundColor() );
-        VECTOR2I end( aPlotter->PageSettings().GetWidthIU( schIUScale.IU_PER_MILS ),
-                      aPlotter->PageSettings().GetHeightIU( schIUScale.IU_PER_MILS ) );
+
+        // Use page size selected in schematic to know the schematic bg area
+        const PAGE_INFO& actualPage = aScreen->GetPageSettings(); // page size selected in schematic
+        VECTOR2I end( actualPage.GetWidthIU( schIUScale.IU_PER_MILS ),
+                      actualPage.GetHeightIU( schIUScale.IU_PER_MILS ) );
+
        aPlotter->Rect( VECTOR2I( 0, 0 ), end, FILL_T::FILLED_SHAPE, 1.0 );
    }

@@ -437,8 +441,11 @@ bool SCH_PLOTTER::plotOneSheetPS( const wxString& aFileName, SCH_SCREEN* aScreen
    {
        plotter->SetColor( plotter->RenderSettings()->GetLayerColor( LAYER_SCHEMATIC_BACKGROUND ) );

-        VECTOR2I end( plotter->PageSettings().GetWidthIU( schIUScale.IU_PER_MILS ),
-                      plotter->PageSettings().GetHeightIU( schIUScale.IU_PER_MILS ) );
+        // Use page size selected in schematic to know the schematic bg area
+        const PAGE_INFO& actualPage = aScreen->GetPageSettings(); // page size selected in schematic
+        VECTOR2I end( actualPage.GetWidthIU( schIUScale.IU_PER_MILS ),
+                      actualPage.GetHeightIU( schIUScale.IU_PER_MILS ) );
+
        plotter->Rect( VECTOR2I( 0, 0 ), end, FILL_T::FILLED_SHAPE, 1.0 );
    }

@@ -612,8 +619,11 @@ bool SCH_PLOTTER::plotOneSheetSVG( const wxString& aFileName, SCH_SCREEN* aScree
    if( aPlotSettings.m_useBackgroundColor && plotter->GetColorMode() )
    {
        plotter->SetColor( plotter->RenderSettings()->GetLayerColor( LAYER_SCHEMATIC_BACKGROUND ) );
-        VECTOR2I end( plotter->PageSettings().GetWidthIU( schIUScale.IU_PER_MILS ),
-                      plotter->PageSettings().GetHeightIU( schIUScale.IU_PER_MILS ) );
+
+        // Use page size selected in schematic to know the schematic bg area
+        VECTOR2I end( actualPage.GetWidthIU( schIUScale.IU_PER_MILS ),
+                      actualPage.GetHeightIU( schIUScale.IU_PER_MILS ) );
+
        plotter->Rect( VECTOR2I( 0, 0 ), end, FILL_T::FILLED_SHAPE, 1.0 );
    }

@@ -631,6 +631,7 @@ void SCH_REFERENCE_LIST::Annotate( bool aUseSheetNum, int aSheetIntervalId, int
            std::vector<int> units = { ref_unit.GetUnit() };
            LastReferenceNumber = FindFirstUnusedReference( ref_unit, minRefId, units );
            ref_unit.m_numRef = LastReferenceNumber;
+            ref_unit.m_numRefStr = wxString::Format( "%d", LastReferenceNumber );
            ref_unit.m_isNew = false;
            ref_unit.m_flag = 1;
        }
@@ -664,7 +665,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
        if( m_flatList[ii].m_isNew )    // Not yet annotated
        {
            if( m_flatList[ii].m_numRef >= 0 )
-                tmp << m_flatList[ii].m_numRef;
+                tmp << m_flatList[ii].m_numRefStr;
            else
                tmp = wxT( "?" );

@@ -692,7 +693,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
        if( std::max( m_flatList[ii].GetLibPart()->GetUnitCount(), 1 ) < m_flatList[ii].m_unit )
        {
            if( m_flatList[ii].m_numRef >= 0 )
-                tmp << m_flatList[ii].m_numRef;
+                tmp << m_flatList[ii].m_numRefStr;
            else
                tmp = wxT( "?" );

@@ -731,7 +732,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
        if( first.m_unit == second.m_unit )
        {
            if( first.m_numRef >= 0 )
-                tmp << first.m_numRef;
+                tmp << first.m_numRefStr;
            else
                tmp = wxT( "?" );

@@ -751,12 +752,12 @@ int SCH_REFERENCE_LIST::CheckAnnotation( ANNOTATION_ERROR_HANDLER aHandler )
        if( first.GetLibPart()->GetUnitCount() != second.GetLibPart()->GetUnitCount() )
        {
            if( first.m_numRef >= 0 )
-                tmp << first.m_numRef;
+                tmp << first.m_numRefStr;
            else
                tmp = wxT( "?" );

            if( second.m_numRef >= 0 )
-                tmp2 << second.m_numRef;
+                tmp2 << second.m_numRefStr;
            else
                tmp2 = wxT( "?" );

@@ -181,17 +181,10 @@ public:

    wxString GetRefNumber() const
    {
-        wxString ref;
-
        if( m_numRef < 0 )
            return wxT( "?" );

-        // To avoid a risk of duplicate, for power symbols the ref number is 0nnn instead of nnn.
-        // Just because sometimes only power symbols are annotated
-        if( GetLibPart() && GetLibPart()->IsPower() )
-            ref = wxT( "0" );
-
-        return ref << m_numRef;
+        return m_numRefStr;
    }

    int CompareValue( const SCH_REFERENCE& item ) const
@@ -34,6 +34,8 @@
 #include <sch_shape.h>
 #include "plotters/plotter.h"

+// This is a horribly fix for a link issue
+extern template class wxAnyValueTypeImpl<FILL_T>;

 SCH_SHAPE::SCH_SHAPE( SHAPE_T aShape, int aLineWidth, FILL_T aFillType, KICAD_T aType ) :
    SCH_ITEM( nullptr, aType ),
@@ -66,6 +68,17 @@ void SCH_SHAPE::SetStroke( const STROKE_PARAMS& aStroke )
 }


+void SCH_SHAPE::SetFilled( bool aFilled )
+{
+    if( !aFilled )
+        m_fill = FILL_T::NO_FILL;
+    else if( GetParent()->IsType( { SCH_SYMBOL_T, LIB_SYMBOL_T } ) )
+        m_fill = FILL_T::FILLED_SHAPE;
+    else
+        m_fill = FILL_T::FILLED_WITH_COLOR;
+}
+
+
 void SCH_SHAPE::Move( const VECTOR2I& aOffset )
 {
    move( aOffset );
@@ -550,9 +563,55 @@ static struct SCH_SHAPE_DESC
                    return false;
                };

+        auto isSymbolItem =
+                []( INSPECTABLE* aItem ) -> bool
+                {
+                    if( SCH_SHAPE* shape = dynamic_cast<SCH_SHAPE*>( aItem ) )
+                        return shape->GetLayer() == LAYER_DEVICE;
+
+                    return false;
+                };
+
+        auto isSchematicItem =
+                []( INSPECTABLE* aItem ) -> bool
+                {
+                    if( SCH_SHAPE* shape = dynamic_cast<SCH_SHAPE*>( aItem ) )
+                        return shape->GetLayer() != LAYER_DEVICE;
+
+                    return false;
+                };
+
+        auto isFillColorEditable =
+                []( INSPECTABLE* aItem ) -> bool
+                {
+                    if( SCH_SHAPE* shape = dynamic_cast<SCH_SHAPE*>( aItem ) )
+                    {
+                        if( shape->GetParent()->IsType( { SCH_SYMBOL_T, LIB_SYMBOL_T } ) )
+                            return shape->GetFillMode() == FILL_T::FILLED_WITH_COLOR;
+                        else
+                            return shape->IsFilled();
+                    }
+
+                    return true;
+                };
+
        propMgr.OverrideAvailability( TYPE_HASH( SCH_SHAPE ), TYPE_HASH( SCH_ITEM ),
                                      _HKI( "Position X" ), isPolygon );
        propMgr.OverrideAvailability( TYPE_HASH( SCH_SHAPE ), TYPE_HASH( SCH_ITEM ),
                                      _HKI( "Position Y" ), isPolygon );
+
+        propMgr.OverrideAvailability( TYPE_HASH( SCH_SHAPE ), TYPE_HASH( EDA_SHAPE ),
+                                      _HKI( "Filled" ), isSchematicItem );
+
+        propMgr.OverrideWriteability( TYPE_HASH( SCH_SHAPE ), TYPE_HASH( EDA_SHAPE ),
+                                      _HKI( "Fill Color" ), isFillColorEditable );
+
+        void ( SCH_SHAPE::*fillModeSetter )( FILL_T ) = &SCH_SHAPE::SetFillMode;
+        FILL_T ( SCH_SHAPE::*fillModeGetter )() const = &SCH_SHAPE::GetFillMode;
+
+        propMgr.AddProperty( new PROPERTY_ENUM<SCH_SHAPE, FILL_T>( _HKI( "Fill" ),
+                        fillModeSetter, fillModeGetter ),
+                        _HKI( "Shape Properties" ) )
+                .SetAvailableFunc( isSymbolItem );
    }
 } _SCH_SHAPE_DESC;
@@ -72,6 +72,8 @@ public:
            return m_stroke.GetLineStyle();
    }

+    void SetFilled( bool aFilled ) override;
+
    const BOX2I GetBoundingBox() const override    { return getBoundingBox(); }

    VECTOR2I GetPosition() const override { return getPosition(); }
@@ -656,9 +656,13 @@ void SCH_SHEET_PATH::CheckForMissingSymbolInstances( const wxString& aProjectNam
            {
                symbolInstance.m_Reference =
                        symbol->GetField( REFERENCE_FIELD )->GetShownText( this, true );
+                symbolInstance.m_Unit = symbol->GetUnit();
            }
            else
            {
+                // When schematics are shared, we cannot know which instance the current symbol
+                // reference field and unit belong to.  In this case, we clear the reference
+                // annotation and set the unit to 1.
                symbolInstance.m_Reference = UTIL::GetRefDesUnannotated( symbol->GetPrefix() );
            }

@@ -2177,12 +2177,12 @@ bool SCH_SYMBOL::UpdateDanglingState( std::vector<DANGLING_END_ITEM>& aItemListB
 }


-VECTOR2I SCH_SYMBOL::GetPinPhysicalPosition( const LIB_PIN* Pin ) const
+VECTOR2I SCH_SYMBOL::GetPinPhysicalPosition( const LIB_PIN* aPin ) const
 {
-    wxCHECK_MSG( Pin != nullptr && Pin->Type() == LIB_PIN_T, VECTOR2I( 0, 0 ),
-                 wxT( "Cannot get physical position of pin." ) );
+    if( ( aPin == nullptr ) || ( aPin->Type() != LIB_PIN_T ) )
+        return VECTOR2I( 0, 0 );

-    return m_transform.TransformCoordinate( Pin->GetPosition() ) + m_pos;
+    return m_transform.TransformCoordinate( aPin->GetPosition() ) + m_pos;
 }


@@ -2699,7 +2699,8 @@ bool SCH_SYMBOL::IsSymbolLikePowerGlobalLabel() const

 bool SCH_SYMBOL::IsPower() const
 {
-    wxCHECK( m_part, false );
+    if( !m_part )
+        return false;

    return m_part->IsPower();
 }
@@ -23,6 +23,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

+#include <advanced_config.h>
 #include <base_units.h>
 #include <pgm_base.h>
 #include <sch_edit_frame.h>
@@ -278,7 +279,7 @@ wxString SCH_TEXT::GetShownText( const SCH_SHEET_PATH* aPath, bool aAllowExtraTe
    }
    else if( HasTextVars() )
    {
-        if( aDepth < 10 )
+        if( aDepth < ADVANCED_CFG::GetCfg().m_ResolveTextRecursionDepth )
            text = ExpandTextVars( text, &textResolver );
    }

@@ -21,6 +21,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

+#include <advanced_config.h>
 #include <base_units.h>
 #include <pgm_base.h>
 #include <sch_edit_frame.h>
@@ -309,7 +310,7 @@ wxString SCH_TEXTBOX::GetShownText( const SCH_SHEET_PATH* aPath, bool aAllowExtr

    if( HasTextVars() )
    {
-        if( aDepth < 10 )
+        if( aDepth < ADVANCED_CFG::GetCfg().m_ResolveTextRecursionDepth )
            text = ExpandTextVars( text, &textResolver );
    }

--- a/Show More
+++ b/Show More