Related to #11618 and #11614 Signed-off-by: Vincent Demeester <vincent@sbr.pm> Upstream-commit: 10e114fb956db1b1a8bc9308cc6d14cbf30a5bab Component: engine