3688a9ca61
Fixes https://gitlab.com/kicad/code/kicad/-/issues/21859
Fixes https://gitlab.com/kicad/code/kicad/-/issues/13636
(cherry picked from commit 44f932e9ec)