merged from svn