Merge branch 'normal_cql'