Co-authored-by: cuong-tran <cuongtran.tm@gmail.com> (cherry picked from commit 2b0c28938bfd74577d2ff0736b2cc72f4e4705cf)