Signed-off-by: Xin Sun <ddupgs@gmail.com> (cherry picked from commit 35aa57e4452c6f0a7f5037371edca64163913345)