svn merge 51950