Fixes #26027 Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: 28a9a7deb002f3c86cb59dbd02ee75435e7fe1e2 Component: engine