[Fixed] incorrect restore from backup to file storage
Merge remote-tracking branch 'origin/master'