merge f_fc_1_index_module branch
update configs
update conflict files