AJ-1573 Improve rubric grade selection process.