Merge "Fix verifier deps determinism"