make setup is detected correctly
Merge hotfix setup-check into dev