Fixed the backup config.
Merge branch 'backup' into develop