Merge remote-tracking branch 'origin/test/17551-prevent-defunct-processes' into stable (Closes: #17551)