Fixes for items 2,3,4 for DSC-341
Merge pull request #505 from nla/ti_work_copy_defects

Fixes for items 2,3,4 for DSC-341