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