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

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