Merge branch 'backport-3.31-process-timeout-terminate'