merged with svn r2365