Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> (cherry picked from commit 26615ededc)
26615ededc