Merge "Follow SliceManager API changes" into pi-dev