core
core copied to clipboard
Fixes to the backup import
See commit messages.
Also need to think how to add at least some tests for this.