Prepare the bootstrap tool for the new check-cfg syntax
#116983
+34
−9
Merged