DSC-1103: remaining defects list 2 for single upload (DSC-240 and DSC-258)
Merge branch 'master' into nn-dsc-1103
Merge pull request #854 from nla/nn-dsc-1103

Nn dsc 1103