Merge "Fix issue #3271486: SetupWizward NullPointerException in"