Merge "Move full backup/restore onto dedicated threads"