Merge change 2569 into donut

* changes:
  Fix a hang during bootup.