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