Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: 0687d76ab1f54250ee7611822d4194a44217fa83 Component: engine