Merge pull request #4520 from EmmanuelMess/emmanuelmess/fix/broken_folder_transifex