Co-authored-by: Cuong-Tran <cuongtran.tm@gmail.com> (cherry picked from commit e62cd0e816402303fdf12513816894624f77e208)