Flowerhack/merge ssck and cl

LMS-2858