(cherry picked from commit 8714653a2f3b1a1f536494bcefbe66e7a7bbb4f7) Co-authored-by: Cuong-Tran <16017808+cuong-tran@users.noreply.github.com>