base on svn1632