Merge "Disambiguate confusing $fromReplica variable in BlockManager"