Issue fixed and tested
Merge pull request #201 from lyncode/DS-1507-4.x

DS-1507 Issue fixed and tested (4.x)