Merge branch 'docs_backup_restore' into 'develop'