Bootstrap command refactoring: port remaining commands with access to Build (step 6)
#127680
+147
−187
Build (step 6)
#127680