Fixes #11413 Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com> Upstream-commit: dcff07d03d9accbedd2467fe9c7c10fba7c2b35c Component: engine