Merge change 26047 into eclair

* changes:
  Fix up the first-backup-ever tracking