Partially fix issue #16756 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com> Upstream-commit: 1814a1dac54eba86616a73b9430788a8c587d4cb Component: engine