IDEX-927
IDEX-927
Workdpace DTO changes;
Merge branch 'IDEX-927'