Update svn r500
svn revision 501
merge r501