Fixes #13170 Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com> Upstream-commit: 274c838ced96e1b7f9b6c5854856004d0b130627 Component: engine