Merge change 4389 into donut

* changes:
  More bmgr work; fix clear-data signalling