More .nd2 fixes (rebased onto develop)



This is the same as gh-420 but rebased onto develop.

----

See tickets #10526 and #10530.