added config default system provider and codegen
fixed merge conflict