DBC 1130 - Convert to strict cql.
Merge branch 'DBC-1130' into develop