Another try to fix InspectExecID Upstream-commit: 2c6fa8375ba1b124abf46d8ea6fd874146b8db60 Component: engine