Merge "Fix calculation of stashed blocks." am: db08d835d0
am: 8287572f7f

* commit '8287572f7fefe72e4519aab96ea4e93d3c02ed2b':
  Fix calculation of stashed blocks.