anchor.diff:  	Error ->
   	    {reply, Error, State}
       end;
  +%% </BACKWARD-COMPAT>
   
   
   %% Check agent version? This op not in v1
  +handle_call({sync_get_bulk, Pid, UserId, TargetName, 
  +	     NonRep, MaxRep, Oids, SendOpts}, 
  +	    From, State) ->
  +    ?vlog("received sync_get_bulk [~p] request", [CtxName]),
  +    case (catch handle_sync_get_bulk(Pid, 
  +				     UserId, TargetName, NonRep, MaxRep, Oids, 
  +				     SendOpts, From, State)) of
  +	ok ->
  +	    {noreply, State};
  +	Error ->
  +	    {reply, Error, State}
  +    end;
  +
  +%% <BACKWARD-COMPAT>
  +%% The only case where this would be called is during code upgrade
   handle_call({sync_get_bulk, Pid, UserId, TargetName, 
   	     NonRep, MaxRep, CtxName, Oids, Timeout, ExtraInfo}, 
   	    From, State) ->
  
positive.code:     end;
  
  %% <BACKWARD-COMPAT>
  handle_call({sync_get, Pid, UserId, TargetName, CtxName, Oids, Timeout, ExtraInfo}, 
  	    From, State) ->
      ?vlog("received sync_get [~p] request", [CtxName]),
      case (catch handle_sync_get(Pid, 
  				UserId, TargetName, CtxName, Oids, 
  				Timeout, ExtraInfo, From, State)) of
  
negative.code: %% </BACKWARD-COMPAT>
  
  
  handle_call({sync_get_next, Pid, UserId, TargetName, Oids, SendOpts}, 
  	    From, State) ->
      ?vlog("[~p,~p] received sync_get_next request for: "
  	  "~n   ~p", [UserId, TargetName, Opts]),
      case (catch handle_sync_get_next(Pid, 
  				     UserId, TargetName, Oids, SendOpts, 
  				     From, State)) of
  	ok ->
  	    {noreply, State};
  	Error ->
  	    {reply, Error, State}
      end;
  
  
  %% <BACKWARD-COMPAT>
  %% The only case where this would be called is during code upgrade
  handle_call({sync_get_next, Pid, UserId, TargetName, CtxName, Oids, 
  	     Timeout, ExtraInfo}, From, State) ->
      ?vlog("[~p,~p] received sync_get_next request for"
  	  "~n   ~p", [UserId, TargetName, Opts]),
      case (catch handle_sync_get_next(Pid, 
  				     UserId, TargetName, CtxName, Oids, 
  				     Timeout, ExtraInfo, From, State)) of
  