Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com> Upstream-commit: 718eba88363c14065b3a2a2dfbc9f270fc7cf63e Component: engine