Merge change 24973 into eclair

* changes:
  increase reserved blocks from 5 to 8