Refactor and fix backup/restore

Created by: dzaporozhets

Assignee Loading
Time tracking Loading