Signed-off-by: Mathieu Parent <math.parent@gmail.com> Upstream-commit: ee75c3fca2581a47381f11ba495ecfb7313f9c33 Component: engine