update mainline to svn 205387