Added Grade validation where grade could have 2 override finals
[close-12089718]