sync to svn r38