fix fetch_from_backup
Merge branch 'master' into events