Signed-off-by: Simon Vikstrom <pullreq@devsn.se> Upstream-commit: d7bf5e3b4db05b64d969127f6465f47cf4fe97d0 Component: engine