Merge branch 'docs/improve-backup-restore' into 'develop'