Merge "Add args to the setup script" into main