MDL-47059 Grades: Make natural weights work with extra credit

Part of: MDL-46576