fix number override validation
Merge branch 'grant-date-fix' into testing