Fixed a number of defects in DSC-337
Merge branch 'master' into nn-dsc-337
url path update.
Merge pull request #530 from nla/nn-dsc-337

Nn dsc 337, merged.