Merge pull request #67 from Edzelopez/GEP-19

GEP-50 Added conditions to check if grant program extension was enabled