Merge "CQL changes"