Merge "Remove fs_config_generate()"