Merge change 3243 into donut

* changes:
  Fix backup agent unbind