move KSM to common (2/2)