Fix module linking and i18n problems in new version.
Fix module linking and i18n problems in new version.
Fix module linking and i18n problems in new version.
Merge origin/master