Fixes: lp:1827820 * https://bugs.launchpad.net/kicad/+bug/1827820
Fixes: lp:1743141 * https://bugs.launchpad.net/kicad/+bug/1743141 (cherry picked from commit 13ece03)