Merge "Add feature to disable slices"