Merge branch 'svn1_8_new'