Cleanup and improve --check-cfg
implementation
#117025
+193
−202
Merged