Fix x setup -h -v should work
#96584
+74
−21
Merged