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