This merge request fixes the backup restore system.
Note that it might not be backward compatible.
Fixes #492