anchor.diff:              %% if there's nothing to move, we're done
               ok;
           false ->
  -            %% pause index on old master node
  -            case cluster_compat_mode:is_index_pausing_on() of
  +            case IndexAware of
                   true ->
  -                    system_stats_collector:increment_counter(index_pausing_runs, 1),
  -                    janitor_agent:set_vbucket_state(Bucket, OldMaster, Parent, VBucket, active,
  -                                                    paused, undefined),
  -                    wait_master_seqno_persisted_on_replicas(Bucket, VBucket, Parent, OldMaster,
  -                                                            AllBuiltNodes);
  +                    %% pause index on old master node
  +                    case cluster_compat_mode:is_index_pausing_on() of
  +                        true ->
  +                            system_stats_collector:increment_counter(index_pausing_runs, 1),
  +                            janitor_agent:set_vbucket_state(Bucket, OldMaster, Parent, VBucket, active,
  +                                                            paused, undefined),
  +                            wait_master_seqno_persisted_on_replicas(Bucket, VBucket, Parent, OldMaster,
  +                                                                    AllBuiltNodes);
  +                        false ->
  +                            ok
  +                    end,
  +
  +                    wait_index_updated(Bucket, Parent, NewMaster, ReplicaNodes, VBucket),
  +
  +                    ?rebalance_debug("Index is updated on new master.");
                   false ->
                       ok
               end,
  -
  -            wait_index_updated(Bucket, Parent, NewMaster, ReplicaNodes, VBucket),
  -
  -            ?rebalance_debug("Index is updated on new master."),
   
               master_activity_events:note_takeover_started(Bucket, VBucket, OldMaster, NewMaster),
               ok = janitor_agent:upr_takeover(Bucket, Parent, OldMaster, NewMaster, VBucket),
  
positive.code:             ok
      end.
  
  inhibit_view_compaction(Parent, Node, Bucket, NewNode) ->
      case cluster_compat_mode:rebalance_ignore_view_compactions() of
          false ->
  
negative.code:             ok
      end.
  
  maybe_initiate_indexing(_Bucket, _Parent, _JustBackfillNodes, _ReplicaNodes, _VBucket, false) ->
      ok;
  maybe_initiate_indexing(Bucket, Parent, JustBackfillNodes, ReplicaNodes, VBucket, true) ->
      ok = janitor_agent:initiate_indexing(Bucket, Parent, JustBackfillNodes, ReplicaNodes, VBucket),
      master_activity_events:note_indexing_initiated(Bucket, JustBackfillNodes, VBucket).
  
  mover_inner_upr(Parent, Bucket, VBucket,
                  [OldMaster|_] = OldChain, [NewMaster|_] = NewChain, IndexAware) ->
      process_flag(trap_exit, true),
  
      maybe_inhibit_view_compaction(Parent, OldMaster, Bucket, NewMaster, IndexAware),
  
      %% build new chain as replicas of existing master
      {ReplicaNodes, JustBackfillNodes} =
  