Migrated master branch of the cspclient