Merge "Fixed bug on incorrectly revisiting same block." am: a2313aa470
am: a38b4428f3

* commit 'a38b4428f3e5be4e54487a3b65d300a03fd8ca4f':
  Fixed bug on incorrectly revisiting same block.