Merge with KS change