merge with svn r147