Merge pull request #4608 from EmmanuelMess/emmanuelmess/fix/luri_locale