Merge branch 'master' into normal_cql