DLSCLIENT: manually merge r50072 from subversion