merge backups-fixes branch