Signed-off-by: Evan Carmi <evan@ecarmi.org> Upstream-commit: 8d1485bd3f1c1c8c94b8673ba818ed374fe10022 Component: engine
This is split off from #2970. Upstream-commit: 06a818616bfce86e90152aeaffaf9394a085c356 Component: engine