Fixes for DSC-444
Merge branch 'master' into nn-dsc-444
Merge pull request #556 from nla/nn-dsc-444

Nn dsc 444