MERGE FROM DEVELOP BRANCH: Fixed about the empty text files in the filemanager.