sync to svn r71