Merge "Reorient SIM processing around slot id" into main