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