Merge "ART: Distinguish Checker lines from comments"