update and sync with svn@143 english version