Prepare the bootstrap tool for the new check-cfg syntax
#116983
Merged
bootstrap tool for the new check-cfg syntax
#116983