Enabled cross app i18n support

3 commit but only the last one contains changes