Fixes: #19072 Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com> Upstream-commit: 01e873790e587ebbee761b1f52871901c89c0fc4 Component: engine