fix merge master->ResvProc-Client