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