Update: Generate config files from templates
MERGE