merging svn 347