Merge change Iaa6e73a6 into eclair

* changes:
  Revive backup tests