Some changes
Fixed merge
Fixes
Merge
Save backup files to temp folder
Merge