add wait for terminate

Closes #3379560

Merge request reports

Loading