add multi-generator data mapping
Merge remote-tracking branch 'origin/mgen_122913' into mgen_122913