Merge change 7726 into donut

* changes:
  Fix issue 1985479	lots of backup NPEs.