Merge "Prioritize non-slices over slices" into main