Merge "Fixed bug on incorrectly revisiting same block."