Veris 6 conversion from svn