Merge branch 'master' into develop
DDBEASY 255 - Convert to strict CQL.
Merge branch 'DDBEASY-255' into develop
Merge branch 'develop'