Fix for TMART-227
Merge pull request #64 from charlotte-raillere/Issue_TMART_227

Fix for TMART-227