MDL-32249 completion: Make grade criteria more consistent