remove stupidness from the config file generation
Merge branch 'release/12.0' into develop