ALL: Huge upstream synch + PerRom DelaySI & CountPerOp parameters
RICE: A few missing files added back