more changes for svn merge