Merge "Fix stale root error in verifier" into lmp-dev