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