Merge "ART: Allow to set and copy conflicts in the verifier"