nd_selftest v2 hotfix

label: DEMO PROD

hydrated: not yet