Signed-off-by: André Martins <aanm90@gmail.com> Upstream-commit: 6eef5ab42d31b9aa5287e34f95af05fd584a4f85 Component: engine