Fixes part of #16756 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com> Upstream-commit: f4abc6406e5837cee33763b6784b89578045d4db Component: engine
Fixes part of #16756 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com> Upstream-commit: f4abc6406e5837cee33763b6784b89578045d4db Component: engine