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