1806 | Subhas/Viky | Fix and Optimize Windows Installer