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