Add Wait() calls in the appropriate spots Upstream-commit: 88cefe20b40d91b998fb12c92a5a4ef445f3ab15 Component: engine