Budget Errors with Grant Budgets Crossing Fiscal Years

We have encountered an issue where we are getting "No Budget Exist" budget errors on a grant project, as we have just moved into the new fiscal year.

Our fiscal calendar is September through August

Grant Start/End Dates are 04/01/2020 - 04/30/2022 with one Budget Period

The original grant budget was finalized in April 2020 during fiscal year 2020.  Now that we have crossed into fiscal year 2021 we are getting the "No Budget Exist" budget errors.  It does not appear that commitment control is capturing the grant budget period of 04/01/2020 - 04/30/2022, instead it is capturing the budget period as 2020 and forcing us to update the budget lines with 2021 budget dates.  We believe on Grant projects the grant start/end dates defines the actual budget period so grant budgets do not need to be adjusted when crossing fiscal years.