Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com> Upstream-commit: 597835e6454be55963959f5f9d586b71517a7f1e Component: engine