merge with svn 169