Merge "fix the bug of patch verify"