Merge from trunk; no longer check if slice is local or peer