Merge "Fix stale root error in verifier"