merge svn 352