Merge branch 'jl/use-vsatisfy-correctly-for-2.0'