Merge pull request #15633 from Zlash65/setup-fix

[Minor] Setup Wizard failing fix