Fixes for DSC-354
Merge branch 'master' into ti_dsc-354
Merge pull request #503 from nla/ti_dsc-354

Edit Copy Fixes