merge changes from l10n