Remerge cleaned up code with KiCad product branch