Resolves #18750 Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com> Upstream-commit: 278e75800c7be10ca43ffb11de25cd342da106fe Component: engine