Merge pull request #18963 from samuelsov/nli18n