Merge pull request #6553 from stokito/luc-mod-system_filemanager