Fix issue with plugin exit. Upstream-commit: 584d23d8494ed07e5eb9684297eefc065ae7fedd Component: engine