sync with admin.svn