Reapply changes that were lost in 80f5ad3
Reapply changes that were lost in 80f5ad3

Curahelper/Cura,Curahelper/Cura,hmflash/Cura,ynotstartups/Wanhao,fieldOfView/Cura,ynotstartups/Wanhao,hmflash/Cura,fieldOfView/Cura