[RJA-2907][fix] - Additional cases added
Merge pull request #1046 from rsvato/master

[RJA-2907][fix] - Additional cases added