DSC-971: defects for single upload
Merged with master
Merge pull request #824 from nla/nn-dsc-971

nn dsc 971 - defects for single upload