MDL-39748 - Grading - Fixing the increasing height regression