See #22860 Signed-off-by: Nahum Shalman <nshalman@omniti.com> Upstream-commit: fd7d99ed283bea260fa5e674ee8200038196fdac Component: engine