Merge pull request #232 from Edzelopez/4.4

RG-216 Added support for grant progrmas for v4.4
RG-216 Bug Fixes for 4.4