Signed-off-by: Omri Shiv <Omri.Shiv@teradata.com> (cherry picked from commit fe1083d4622658e9e5bf7319d0f94873019fced2) Upstream-commit: b941f081523cce7defafd4457f380442e10fa345 Component: engine