Merge "No longer print hash for stashed blocks during verification of retry"