merged with svn changes