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