Move KSM to common (1/2)