RG-216 Bug Fixes for 4.4
Merge pull request #233 from Edzelopez/4.4

RG-216 Bug Fixes for 4.4