Flowerhack/merge ssck and cl

LMS-2858
I think the deprecated form should probably still assert that the same set of characters are invalid.