Merge "Remove usage of slice_internals feature"