Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com> Upstream-commit: 3a0554585177a55802377423bb4529d305b4566f Component: engine