Merge "Add support for CNF-conformance check"