Merge branch 'jn/more-i18ncmp'