Merge "Refactor CustomSliceManager."