Fixes #9550 Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk> Upstream-commit: 4f6cdb12ab64cf76f5a57cb1d24081882c61def3 Component: engine