svn revision 502
merge with r502