update mainline to svn 195570