DSC-514: remaining defects for DSC-236
Merge pull request #584 from nla/nn-dsc-514

DSC-514: remaining defects for DSC-236, merged.