PAHMA-1144: re-include csid_s in datastore.