Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com> Upstream-commit: 02923d43e20f7be6c2e1ed48846d188a682ff919 Component: engine