nd_selftest v2 hotfix

label: (none)

hydrated: not yet