Signed-off-by: Colin Hebert <hebert.colin@gmail.com> Upstream-commit: a1aa69433da83a03d3adf039de4a18d0d73be8e1 Component: engine