Small updates following from unittest 'Test_NDEATH'
Authored by: aliazzz 2020-08-22
Parent: [r301]
Child: [r303]