Merge pull request #1649 from dunxen/2022-08-implementnodefailure