Several bug fixes in current NDData 

The intent is that this PR contains fixes to the current behavior of NDData without proposing new behavior (i.e. it fixes bugs but should not suggest additions or changes in behavior beyond fixing the bugs).

Before merging:
+ [ ] changelog entries need to be written after issues have been tagged with a release.
+ [ ] rebase if #2395 is merged

Issues addressed are: #2406