[OE-3659] dr grading bugfixes