Fixes #12088 Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com> Upstream-commit: 9424fc14bb7465f9874e6e3560cf62b560dbd13d Component: engine