DATACASS-96 - integrated CqlIdentifier
DATACASS-96 - minor edits
DATACASS-96 - resolved merge conflicts