file-manager-fixes
Merge pull request #971 from ExchangeCore/file-manager-fixes

file-manager-fixes