This fixes #22231 Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com> Upstream-commit: 864e362aa05ed2207d71471780068e951fe9d02e Component: engine