sync to svn r44