Merge pull request #8115 from rohitwaghchaure/setup_wizard_unpickle_issue

[fix] UnpickleError, removed _ method from the argument of the function