svn r508
merge r508