Merge: i18n annotation