This is as discussed on #447. Upstream-commit: 4b3354af3fa4cea59271ace7cc4d1d072312b688 Component: engine