Merge "Refactor scanInstallPackages" into main