Flowerhack/merge ssck and cl

LMS-2858
Good cos that's what I'm doing :)