[RJA-2035][RJA-2085][fix] - Fixes
Merge pull request #923 from rsvato/master

[RJA-2035][RJA-2085][fix] - Fixes