CONTRIB-4300 Fix graded/marked checks