Merge from svn old branch