Merge "Some Slices API refinement" into pi-dev