Merge "Fix a concurrent modification exception in Slice provider." into pi-dev