Merge "Add some null checks to slices" into pi-dev