V2

Yes delphi2007 tests pass for me