Flowerhack/merge ssck and cl

LMS-2858
The kwargs are used for things like `deprecated`.