Merge branch 'release/7.x-1.12' into develop
convert cql operators to contants
Revert "convert cql operators to contants"

This reverts commit d046694aa6df5654f4f01058a6f2e8fcd800340a.
Revert "Revert "convert cql operators to contants""

This reverts commit 7e652cd60a93d4b9aaf146ff1a08e4a261154c9f.
version 7.x-1.13
Merge branch 'release/7.x-1.13'