defects for single upload: adding child records
Merge branch 'master' into nn-dsc-1116
Fixed conflict and merged with master
Merge pull request #861 from nla/nn-dsc-1116

nn dsc 1116