With the previous two changes we now pass this test. Upstream-commit: a8af12f80a4a1678988b4667e5211d4e576ce903 Component: engine