Grants SPRINT-17

The following tickets have been selected for the upcoming sprint:

  1. https://ugaovpr.atlassian.net/browse/GRANTS-848

  2. https://ugaovpr.atlassian.net/browse/GRANTS-822

  3. https://ugaovpr.atlassian.net/browse/GRANTS-809