[-] Installer : Backport of #PSCFV-6064