terminate issue part 2

clean up code

first draft of deadlock issue

test

resolve terminate deadlock issue

add node level condition

resolve terminate issue

terminate issue part 2

clean up code

first draft of deadlock issue

test

resolve terminate deadlock issue

add node level condition

cleanup code and CI checks

rebase to master and address conflicts

refactor code

fix a bug

Merge pull request !3918 from lilei/random_normal_0724