Merge commit 'origin/bug_563_fix_backuprestore_crash'